diff options
| -rw-r--r-- | mkspecs/cmake/Qt5BasicConfig.cmake.in | 4 | ||||
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 8 | ||||
| -rw-r--r-- | src/corelib/Qt5CoreConfigExtras.cmake.in | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in index 0334b6f6e2..039019abe7 100644 --- a/mkspecs/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in @@ -98,7 +98,7 @@ if (NOT _Qt5$${CMAKE_MODULE_NAME}_target) !!ENDIF endif() -!!IF !isEmpty(debug_type) +!!IF !isEmpty(CMAKE_DEBUG_TYPE) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES 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 -!!IF !isEmpty(release_type) +!!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 6a8045ab3b..9fd833e324 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -114,11 +114,11 @@ macx { } } -debug_type = -release_type = +CMAKE_DEBUG_TYPE = +CMAKE_RELEASE_TYPE = -debug_and_release|debug:debug_type = debug -debug_and_release|release:release_type = release +debug_and_release|debug:CMAKE_DEBUG_TYPE = debug +debug_and_release|release:CMAKE_RELEASE_TYPE = release INSTALLS += cmake_qt5_module_files diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 5acc13c6f3..2ace2c7fdf 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -41,7 +41,7 @@ if (NOT _Qt5WinMain_target) add_library(Qt5::WinMain STATIC IMPORTED) endif() -!!IF !isEmpty(debug_type) +!!IF !isEmpty(CMAKE_DEBUG_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) set_target_properties(Qt5::WinMain PROPERTIES !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -52,7 +52,7 @@ set_target_properties(Qt5::WinMain PROPERTIES ) !!ENDIF -!!IF !isEmpty(release_type) +!!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(Qt5::WinMain PROPERTIES !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) |