diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-14 13:56:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-14 13:56:03 (GMT) |
| commit | 6389da7905258619f9149d754b40baa0a54fc704 (patch) | |
| tree | cae11fed52428c6817894fd91d02d4aca11818d0 | |
| parent | 31e1c39c57d61c208443973b38a4eb6f7f7d187f (diff) | |
| parent | 2509c7678feb2efab79a384fd0b0b35cee8d02b0 (diff) | |
| download | CMake-6389da7905258619f9149d754b40baa0a54fc704.zip CMake-6389da7905258619f9149d754b40baa0a54fc704.tar.gz CMake-6389da7905258619f9149d754b40baa0a54fc704.tar.bz2 | |
Merge topic 'update-Qt4-COMPILE_DEFINITIONS'
2509c767 Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)
| -rw-r--r-- | Modules/UseQt4.cmake | 8 |
1 files changed, 1 insertions, 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 $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>) if(QT_INCLUDE_DIRS_NO_SYSTEM) include_directories(${QT_INCLUDE_DIR}) |