kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-Qt5-windows-build' into release

This commit is contained in:
Brad King 2014-03-17 09:24:12 -04:00
parent aa195cdcbe 61c60b239c
commit 43b39b1c36
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/QtDialog/CMakeLists.txt
View File

@ -27,7 +27,9 @@ if (Qt5Widgets_FOUND)
macro(qt4_add_resources) macro(qt4_add_resources)
qt5_add_resources(${ARGN}) qt5_add_resources(${ARGN})
endmacro() 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. # Remove this when the minimum version of Qt is 4.6.
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
@ -47,6 +49,8 @@ else()
include(${QT_USE_FILE}) include(${QT_USE_FILE})
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}") if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH) get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll") if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
@ -112,7 +116,7 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) 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) if(Qt_BIN_DIR)
set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR}) set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
endif() endif()