[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7062-g4f38556

[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  4f385561d3a683966520246dd7d7a255f106df86 (commit)
       via  2509c7678feb2efab79a384fd0b0b35cee8d02b0 (commit)
      from  2e370cbe9c8254fa601ce79650dad460103bcbd2 (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=4f385561d3a683966520246dd7d7a255f106df86
commit 4f385561d3a683966520246dd7d7a255f106df86
Merge: 2e370cb 2509c76
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 13 09:53:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 13 09:53:47 2014 -0500

    Merge topic 'update-Qt4-COMPILE_DEFINITIONS' into next
    
    2509c767 Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2509c7678feb2efab79a384fd0b0b35cee8d02b0
commit 2509c7678feb2efab79a384fd0b0b35cee8d02b0
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 15:53:00 2014 +0100

    Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)
    
    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:


hooks/post-receive
-- 
CMake