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 153a6aa18909b68b3beb507b438934e298764616 (commit)
via 3d4e64fb38334ff328baabe81a8c314620120ac7 (commit)
from a5862cbf6c95318fdeca5b6a3e71911a9eca891d (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=153a6aa18909b68b3beb507b438934e298764616
commit 153a6aa18909b68b3beb507b438934e298764616
Merge: a5862cb 3d4e64f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Jan 18 04:03:07 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jan 18 04:03:07 2013 -0500
Merge topic 'qt4-autolink-qtmain' into next
3d4e64f Only include qtmain on WIN32.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d4e64fb38334ff328baabe81a8c314620120ac7
commit 3d4e64fb38334ff328baabe81a8c314620120ac7
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Jan 18 07:35:26 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Jan 18 07:35:26 2013 +0100
Only include qtmain on WIN32.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a40ceb0..35420b4 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1062,7 +1062,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
_qt4_add_target_private_depends(phonon DBus)
endif()
- if (NOT QT4_NO_LINK_QTMAIN)
+ if (WIN32 AND NOT QT4_NO_LINK_QTMAIN)
set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
