diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-06 20:22:16 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-09-06 20:22:16 (GMT) |
| commit | ea12871241e1a943be75e7c987f71f54ec3f3908 (patch) | |
| tree | ce3c5311806894d35dcd0ea210e0b82a8e17b97a /Source/cmQtAutomoc.cxx | |
| parent | 894e91a9457800d729f079ec3842e0d0e34b5a50 (diff) | |
| download | CMake-ea12871241e1a943be75e7c987f71f54ec3f3908.zip CMake-ea12871241e1a943be75e7c987f71f54ec3f3908.tar.gz CMake-ea12871241e1a943be75e7c987f71f54ec3f3908.tar.bz2 | |
Automoc: also the makefile-COMPILE_DEFINITIONS
Alex
Diffstat (limited to 'Source/cmQtAutomoc.cxx')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 8365766..386a3bf 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -209,6 +209,12 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); std::string _moc_compile_defs = (tmp!=0 ? tmp : ""); + tmp = makefile->GetProperty("COMPILE_DEFINITIONS"); + if (tmp) + { + _moc_compile_defs += ";"; + _moc_compile_defs += tmp; + } tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS"); std::string _moc_options = (tmp!=0 ? tmp : ""); |