From 67bd27fee2991d91c6aa7098a5842d1737964cad Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 18 Apr 2013 11:14:47 +0200 Subject: [PATCH] List the Qt5::WinMain Release configuration before the Debug one. Apply the logic from commit d7ae34fdfde61838ce1e4fb13a945832841f61ab (List the Release library before the Debug library in cmake files., 2013-02-21) to the Qt5::WinMain library too. Task-number: QTBUG-29186 Change-Id: Ie465fef1cc0fc842d86c5bc69ab84ec65ec652d9 Reviewed-by: Andy Shaw --- src/corelib/Qt5CoreConfigExtras.cmake.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 379fb5d10e4..3932c9e2c73 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -85,17 +85,6 @@ set(Qt5Core_QTMAIN_LIBRARIES Qt5::WinMain) if (NOT TARGET Qt5::WinMain) add_library(Qt5::WinMain STATIC IMPORTED) -!!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) - IMPORTED_LOCATION_DEBUG \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\" -!!ELSE - IMPORTED_LOCATION_DEBUG \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\" -!!ENDIF - ) -!!ENDIF - !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(Qt5::WinMain PROPERTIES @@ -107,6 +96,17 @@ if (NOT TARGET Qt5::WinMain) ) !!ENDIF +!!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) + IMPORTED_LOCATION_DEBUG \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\" +!!ELSE + IMPORTED_LOCATION_DEBUG \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\" +!!ENDIF + ) +!!ENDIF + if (NOT CMAKE_VERSION VERSION_LESS 2.8.11 AND NOT Qt5_NO_LINK_QTMAIN) set(_isExe $,EXECUTABLE>) set(_isWin32 $>)