diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:48:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:48:01 (GMT) |
| commit | 5e993a2822e48c5d84b5bf01aad52ff5068cb5ea (patch) | |
| tree | 5db2f08c4fa8cdd46c56fe52a28f725806aaf575 /Source | |
| parent | a052a79949d9db00cea73f45b2122a67d549a7a8 (diff) | |
| parent | 33ed186fce561d274ffee1acd20c2ceb45931de4 (diff) | |
| download | CMake-5e993a2822e48c5d84b5bf01aad52ff5068cb5ea.zip CMake-5e993a2822e48c5d84b5bf01aad52ff5068cb5ea.tar.gz CMake-5e993a2822e48c5d84b5bf01aad52ff5068cb5ea.tar.bz2 | |
Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS'
33ed186 automoc: Read target defines unconditionally
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 9783ce9..a468fa7 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -280,13 +280,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) _moc_incs += *incDirIt; } - const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); - std::string _moc_compile_defs; - if (tmp) - { - _moc_compile_defs = target->GetCompileDefinitions(0); - } - tmp = makefile->GetProperty("COMPILE_DEFINITIONS"); + std::string _moc_compile_defs = target->GetCompileDefinitions(0); + + const char* tmp = makefile->GetProperty("COMPILE_DEFINITIONS"); if (tmp) { _moc_compile_defs += ";"; |