summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-09-26 10:31:52 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-09-26 17:32:53 (GMT)
commit64b78c147fdfa6a9125371c01acfdfce3666c890 (patch)
treea450720da46ad4d43d181a63b6c2a6bab1b75fe3
parentc3c20d3ce3acbf6afd6a54dd846fd78b82623312 (diff)
downloadCMake-64b78c147fdfa6a9125371c01acfdfce3666c890.zip
CMake-64b78c147fdfa6a9125371c01acfdfce3666c890.tar.gz
CMake-64b78c147fdfa6a9125371c01acfdfce3666c890.tar.bz2
QtAutogen: Move Source initialization to prior loop.
Ensure that all targets have their _automoc.cpp before attempting to initialize the autogen target. The initialization evaluates generator expressions for target sources, and must include the _automoc.cpp of object library dependents in order for TARGET_OBJECTS to include the object file for the corresponding _automoc.cpp file.
-rw-r--r--Source/cmGlobalGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6627bcc..fa9120e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1448,6 +1448,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
continue;
}
+ cmQtAutoGenerators::InitializeAutogenSources(&ti->second);
targetNames.push_back(ti->second.GetName());
}
for(std::vector<std::string>::iterator ti = targetNames.begin();
@@ -1455,8 +1456,6 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
{
cmTarget& target = *this->LocalGenerators[i]
->GetMakefile()->FindTarget(*ti, true);
-
- cmQtAutoGenerators::InitializeAutogenSources(&target);
cmQtAutoGenerators::InitializeAutogenTarget(
this->LocalGenerators[i], &target);
cmQtAutoGenerators autogen;