diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-01-25 13:03:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-29 19:11:49 (GMT) |
| commit | 429e369974015640d7a0878d986e3e418b42b7a4 (patch) | |
| tree | 104b903f2261efb022d4c2ebfffba37a8c6c3e66 /Source/cmQtAutomoc.cxx | |
| parent | 0e10782ba795050e1ea82530d79c323f60478df4 (diff) | |
| download | CMake-429e369974015640d7a0878d986e3e418b42b7a4.zip CMake-429e369974015640d7a0878d986e3e418b42b7a4.tar.gz CMake-429e369974015640d7a0878d986e3e418b42b7a4.tar.bz2 | |
Process COMPILE_DEFINITIONS as generator expressions in QtAutomoc.
Fixes #13493.
Diffstat (limited to 'Source/cmQtAutomoc.cxx')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index bf034cf..cc42175 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -229,7 +229,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) } const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); - std::string _moc_compile_defs = (tmp!=0 ? tmp : ""); + std::string _moc_compile_defs; + if (tmp) + { + _moc_compile_defs = target->GetCompileDefinitions(); + } tmp = makefile->GetProperty("COMPILE_DEFINITIONS"); if (tmp) { |