diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-19 15:13:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-19 15:13:23 (GMT) |
| commit | aed192d2cd7887bcce9135f825ea6a1c1044477b (patch) | |
| tree | 94f5f5201fc1eecedd66bb0ede51158dc4a33ca0 /Modules | |
| parent | 2e075b48e876d0f9b3f90ae225a33359e2d3342f (diff) | |
| parent | 3e97bcb1ef18c7b1e16f81733896764bfd8178aa (diff) | |
| download | CMake-aed192d2cd7887bcce9135f825ea6a1c1044477b.zip CMake-aed192d2cd7887bcce9135f825ea6a1c1044477b.tar.gz CMake-aed192d2cd7887bcce9135f825ea6a1c1044477b.tar.bz2 | |
Merge topic 'Qt4-NO_DEBUG-define'
3e97bcb Use a config-specific moc parameters file, if needed.
b9f0d81 Define QT_NO_DEBUG for non-debug use of Qt 4.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 | ||||
| -rw-r--r-- | Modules/Qt4Macros.cmake | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 24747f7..28b8454 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1203,6 +1203,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) "${QT_MKSPECS_DIR}/default" ${QT_INCLUDE_DIR} ) + set_property(TARGET Qt4::QtCore APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS + $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> + ) set_property(TARGET Qt4::QtCore PROPERTY INTERFACE_QT_MAJOR_VERSION 4 ) diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index b5f005f..fd9819f 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -120,6 +120,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}") if(moc_target) + set (_moc_parameters_file ${_moc_parameters_file}$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>) set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>") set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>") |