From 2509c7678feb2efab79a384fd0b0b35cee8d02b0 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 13 Jan 2014 13:04:03 +0100 Subject: 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. --- Modules/UseQt4.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 $<$>:QT_NO_DEBUG>) if(QT_INCLUDE_DIRS_NO_SYSTEM) include_directories(${QT_INCLUDE_DIR}) -- cgit v0.12