1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix the variables for debug and release types properly.

Browse Source 
Change-Id: I346992effa997f60a4fd20055f0af81d6a084095
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Stephen Kelly 2012-03-26 06:37:31 +02:00 committed by Qt by Nokia
parent 878a661e31
commit 4a6bf9d941
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/cmake/Qt5BasicConfig.cmake.in
View File

@ -98,7 +98,7 @@ if (NOT _Qt5$${CMAKE_MODULE_NAME}_target)
!!ENDIF !!ENDIF
endif() endif()
!!IF !isEmpty(debug_type) !!IF !isEmpty(CMAKE_DEBUG_TYPE)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
@ -115,7 +115,7 @@ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
!!ENDIF !!ENDIF
!!ENDIF !!ENDIF
!!IF !isEmpty(release_type) !!IF !isEmpty(CMAKE_RELEASE_TYPE)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"

8
mkspecs/features/create_cmake.prf
View File

@ -114,11 +114,11 @@ macx {
} }
} }
debug_type = CMAKE_DEBUG_TYPE =
release_type = CMAKE_RELEASE_TYPE =
debug_and_release|debug:debug_type = debug debug_and_release|debug:CMAKE_DEBUG_TYPE = debug
debug_and_release|release:release_type = release debug_and_release|release:CMAKE_RELEASE_TYPE = release
INSTALLS += cmake_qt5_module_files INSTALLS += cmake_qt5_module_files

4
src/corelib/Qt5CoreConfigExtras.cmake.in
View File

@ -41,7 +41,7 @@ if (NOT _Qt5WinMain_target)
add_library(Qt5::WinMain STATIC IMPORTED) add_library(Qt5::WinMain STATIC IMPORTED)
endif() endif()
!!IF !isEmpty(debug_type) !!IF !isEmpty(CMAKE_DEBUG_TYPE)
set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(Qt5::WinMain PROPERTIES set_target_properties(Qt5::WinMain PROPERTIES
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@ -52,7 +52,7 @@ set_target_properties(Qt5::WinMain PROPERTIES
) )
!!ENDIF !!ENDIF
!!IF !isEmpty(release_type) !!IF !isEmpty(CMAKE_RELEASE_TYPE)
set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(Qt5::WinMain PROPERTIES set_target_properties(Qt5::WinMain PROPERTIES
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)