[Cmake-commits] CMake branch, next, updated. v2.8.4-1818-gd9e3266
Clinton Stimpson
clinton at elemtech.com
Thu Jun 23 12:10:24 EDT 2011
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 d9e32669c6492a3650ce46ac00f129d0c0168b0b (commit)
via 5a2b208617d13808287b3c785183fed9c99576f1 (commit)
via 672b6ca5e431f511f2638511b0128b6956f3e3ad (commit)
via d0d5540dc6593ea635050738be9073e40a1eabde (commit)
from 4be5c9259dbcca7f7682ea4bc09a8ffa101f33bd (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=d9e32669c6492a3650ce46ac00f129d0c0168b0b
commit d9e32669c6492a3650ce46ac00f129d0c0168b0b
Merge: 4be5c92 5a2b208
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jun 23 12:09:34 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 23 12:09:34 2011 -0400
Merge topic 'qt4-no-build-type' into next
5a2b208 Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.
672b6ca KWSys Nightly Date Stamp
d0d5540 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2b208617d13808287b3c785183fed9c99576f1
commit 5a2b208617d13808287b3c785183fed9c99576f1
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jun 23 10:08:28 2011 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jun 23 10:08:28 2011 -0600
Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index 9ce475c..dbe28ac 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -21,6 +21,9 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG QT_DEBUG)
SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
+IF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_DEBUG)
+ENDIF()
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
-----------------------------------------------------------------------
Summary of changes:
Modules/UseQt4.cmake | 3 +++
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list