From 429e369974015640d7a0878d986e3e418b42b7a4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 25 Jan 2013 14:03:17 +0100 Subject: Process COMPILE_DEFINITIONS as generator expressions in QtAutomoc. Fixes #13493. --- Source/cmQtAutomoc.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) { -- cgit v0.12