diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:24:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:24:12 (GMT) |
| commit | 43b39b1c3657a9038bb10e1efef0192a45371050 (patch) | |
| tree | 891dbfd6d85e4c4d91989c9f391e44b6d77d11b8 /Source | |
| parent | aa195cdcbe21bf55504ece0b94c4d3e371ecb458 (diff) | |
| parent | 61c60b239c0ddc5eb975bb9cc3721b792a2aa18f (diff) | |
| download | CMake-43b39b1c3657a9038bb10e1efef0192a45371050.zip CMake-43b39b1c3657a9038bb10e1efef0192a45371050.tar.gz CMake-43b39b1c3657a9038bb10e1efef0192a45371050.tar.bz2 | |
Merge branch 'fix-Qt5-windows-build' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 8 |
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() |