summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-06-11 13:36:44 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-06-12 05:21:46 (GMT)
commit67f6cebb1ea3557c3e3144023ba3fea2f5f97ceb (patch)
tree10a2fef89fbabbd9fb91348c0c8a84a07c551844
parent9f460fe40852d1cdf70f827718235f088e167e23 (diff)
downloadCMake-67f6cebb1ea3557c3e3144023ba3fea2f5f97ceb.zip
CMake-67f6cebb1ea3557c3e3144023ba3fea2f5f97ceb.tar.gz
CMake-67f6cebb1ea3557c3e3144023ba3fea2f5f97ceb.tar.bz2
QtAutomoc: Fix handling of list separator for compile definitions.
-rw-r--r--Source/cmQtAutomoc.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 350b462..969e3db 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -283,9 +283,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
std::string _moc_compile_defs = target->GetCompileDefinitions(0);
const char* tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
+ sep = "";
if (tmp)
{
- _moc_compile_defs += ";";
+ _moc_compile_defs += sep;
+ sep = ";";
_moc_compile_defs += tmp;
}
tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");