diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 22:29:47 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 16:39:59 (GMT) |
commit | ce75c86ec30e736a738a4143d4abad73117e06c6 (patch) | |
tree | 6abb1bb3bc07a63021f096670c1e2b34d93f04af /Source/cmGlobalGenerator.cxx | |
parent | 526cc7dc52673f1eeb1055ce381e0551f763daea (diff) | |
download | CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.zip CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.tar.gz CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.tar.bz2 |
cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 765a538..6750611 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2893,13 +2893,14 @@ void cmGlobalGenerator::WriteSummary() { continue; } - this->WriteSummary(ti->second); - fout << ti->second->GetSupportDirectory() << "\n"; + cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second); + this->WriteSummary(gt); + fout << gt->GetSupportDirectory() << "\n"; } } //---------------------------------------------------------------------------- -void cmGlobalGenerator::WriteSummary(cmTarget* target) +void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) { // Place the labels file in a per-target support directory. std::string dir = target->GetSupportDirectory(); @@ -2942,17 +2943,15 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target) fout << "# Source files and their labels\n"; std::vector<cmSourceFile*> sources; std::vector<std::string> configs; - target->GetMakefile()->GetConfigurations(configs); + target->Target->GetMakefile()->GetConfigurations(configs); if (configs.empty()) { configs.push_back(""); } - cmGeneratorTarget* gt = - this->GetGeneratorTarget(target); for(std::vector<std::string>::const_iterator ci = configs.begin(); ci != configs.end(); ++ci) { - gt->GetSourceFiles(sources, *ci); + target->GetSourceFiles(sources, *ci); } std::vector<cmSourceFile*>::const_iterator sourcesEnd = cmRemoveDuplicates(sources); |