summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-03-12 15:58:03 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-03-17 13:15:14 (GMT)
commit61c60b239c0ddc5eb975bb9cc3721b792a2aa18f (patch)
treeea91d1eaf5b659a62d8a47da6736210c09671fc2 /Source/QtDialog
parent7534967b65b03be558940e1a112918ee28d38c20 (diff)
downloadCMake-61c60b239c0ddc5eb975bb9cc3721b792a2aa18f.zip
CMake-61c60b239c0ddc5eb975bb9cc3721b792a2aa18f.tar.gz
CMake-61c60b239c0ddc5eb975bb9cc3721b792a2aa18f.tar.bz2
QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.
Override the QT_QTMAIN_LIBRARY cache variable with a regular variable in the Qt 5 configuration. This avoids linking with the Qt 4 version of the WinMain library.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 4308a4d..07a50b9 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -27,7 +27,9 @@ if (Qt5Widgets_FOUND)
macro(qt4_add_resources)
qt5_add_resources(${ARGN})
endmacro()
- set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+
# Remove this when the minimum version of Qt is 4.6.
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
@@ -47,6 +49,8 @@ else()
include(${QT_USE_FILE})
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
@@ -112,7 +116,7 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(Qt_BIN_DIR)
set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
endif()