diff options
author | Brad King <brad.king@kitware.com> | 2015-08-27 14:04:09 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-27 14:04:09 (GMT) |
commit | 0d0b9b52f8a538a6327e2e9f848b943474afc682 (patch) | |
tree | 31f9f4d82a1dd818df02a7697244a1760ae499ae /Source/cmGlobalGenerator.cxx | |
parent | 6904b6efdc2ea35c3490ba33cb352b03ea3085f5 (diff) | |
parent | 637c56b4e0ce0205f3f28a670881aad07320ff17 (diff) | |
download | CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.zip CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.tar.gz CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.tar.bz2 |
Merge topic 'cmState-ProjectName'
637c56b4 cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
b3f2299e cmState: Move ProjectName from cmMakefile.
6ce940ac cmMakefile: Use std::string in ProjectName API.
e8c0341d cmMakefile: Out-of-line GetProjectName.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index be7896d..bdd5b5a 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2112,18 +2112,19 @@ void cmGlobalGenerator::FillProjectMap() for(i = 0; i < this->LocalGenerators.size(); ++i) { // for each local generator add all projects - cmLocalGenerator *lg = this->LocalGenerators[i]; + cmState::Snapshot snp = this->LocalGenerators[i]->GetStateSnapshot(); std::string name; do { - if (name != lg->GetMakefile()->GetProjectName()) + std::string snpProjName = snp.GetProjectName(); + if (name != snpProjName) { - name = lg->GetMakefile()->GetProjectName(); + name = snpProjName; this->ProjectMap[name].push_back(this->LocalGenerators[i]); } - lg = lg->GetParent(); + snp = snp.GetBuildsystemDirectoryParent(); } - while (lg); + while (snp.IsValid()); } } |