This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 752042c70a9d9a355b5392d2a4d0849d0b423ce2 (commit) via 61c60b239c0ddc5eb975bb9cc3721b792a2aa18f (commit) from 71777c1077af54fb8b0fc87ea8c43f8a771a9c9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=752042c70a9d9a355b5392d2a4d0849d0b423ce2 commit 752042c70a9d9a355b5392d2a4d0849d0b423ce2 Merge: 71777c1 61c60b2 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 17 09:16:23 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Mar 17 09:16:23 2014 -0400 Merge topic 'fix-Qt5-windows-build' into next 61c60b23 QtDialog: Avoid linking to Qt4 WinMain when using Qt 5. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61c60b239c0ddc5eb975bb9cc3721b792a2aa18f commit 61c60b239c0ddc5eb975bb9cc3721b792a2aa18f Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Mar 12 16:58:03 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Mar 17 14:15:14 2014 +0100 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. 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() ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits