[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7060-g2e370cb

[Stephen Kelly]

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  2e370cbe9c8254fa601ce79650dad460103bcbd2 (commit)
       via  131a31dcdfbcfcfca116e4cb568e34f6edeaee79 (commit)
      from  5bd7da432867a7fd4bf398e478d694e51872ee9d (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=2e370cbe9c8254fa601ce79650dad460103bcbd2
commit 2e370cbe9c8254fa601ce79650dad460103bcbd2
Merge: 5bd7da4 131a31d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 13 07:10:54 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 13 07:10:54 2014 -0500

    Merge topic 'update-Qt4-COMPILE_DEFINITIONS' into next
    
    131a31dc Qt4: Use generator expression in COMPILE_DEFINITIONS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=131a31dcdfbcfcfca116e4cb568e34f6edeaee79
commit 131a31dcdfbcfcfca116e4cb568e34f6edeaee79
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 13 13:04:03 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 13 13:10:16 2014 +0100

    Qt4: Use generator expression in COMPILE_DEFINITIONS
    
    Commit 5bb53f6b (cmTarget: Deprecate COMPILE_DEFINITIONS_ properties
    with a policy., 2013-12-30) deprecated the config-specific
    COMPILE_DEFINITIONS_* properties in favour of using generator
    expressions.
    
    Set the directory property in UseQt4.cmake to match the
    INTERFACE_COMPILE_DEFINITIONS on the Qt4::QtCore and Qt5::Core
    IMPORTED targets.  Setting QT_NO_DEBUG is sufficient because qglobal.h
    sets the corresponding QT_DEBUG definition if required.

diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index aa036b7..7478310 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -22,13 +22,7 @@
 #  License text for the above reference.)
 
 add_definitions(${QT_DEFINITIONS})
-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()
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
 
 if(QT_INCLUDE_DIRS_NO_SYSTEM)
   include_directories(${QT_INCLUDE_DIR})

-----------------------------------------------------------------------

Summary of changes:
 Modules/UseQt4.cmake |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
CMake