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 48aa0728067ab0a10c22e4ac44936f5eb7d9a80d (commit)
via b9f0d81c4b605af7667a1f384fc20c17a577f5a8 (commit)
from 1eea30f266edfa503676a0697d4f37508760c43d (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=48aa0728067ab0a10c22e4ac44936f5eb7d9a80d
commit 48aa0728067ab0a10c22e4ac44936f5eb7d9a80d
Merge: 1eea30f b9f0d81
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Dec 10 12:34:14 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 10 12:34:14 2013 -0500
Merge topic 'Qt4-NO_DEBUG-define' into next
b9f0d81 Define QT_NO_DEBUG for non-debug use of Qt 4.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9f0d81c4b605af7667a1f384fc20c17a577f5a8
commit b9f0d81c4b605af7667a1f384fc20c17a577f5a8
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Dec 10 18:31:36 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Dec 10 18:33:52 2013 +0100
Define QT_NO_DEBUG for non-debug use of Qt 4.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 24747f7..28b8454 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1203,6 +1203,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
"${QT_MKSPECS_DIR}/default"
${QT_INCLUDE_DIR}
)
+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS
+ $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>
+ )
set_property(TARGET Qt4::QtCore PROPERTY
INTERFACE_QT_MAJOR_VERSION 4
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
