From ea12871241e1a943be75e7c987f71f54ec3f3908 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Thu, 6 Sep 2012 22:22:16 +0200 Subject: Automoc: also the makefile-COMPILE_DEFINITIONS Alex --- Source/cmQtAutomoc.cxx | 6 ++++++ 1 file changed, 6 insertions(+) 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 : ""); -- cgit v0.12