diff options
author | Daniel Eiband <daniel.eiband@brainlab.com> | 2019-08-30 09:47:37 (GMT) |
---|---|---|
committer | Daniel Eiband <daniel.eiband@brainlab.com> | 2019-08-30 11:52:13 (GMT) |
commit | 10507c6dc0918777d43b3f961bd18162866f0bbb (patch) | |
tree | d0b05fd25d6c25e3ef47a81905bed33a65cccc49 /Source/cmGlobalGenerator.cxx | |
parent | 3ec986ce8e8df269eb6b6b9f37e12b02194168fd (diff) | |
download | CMake-10507c6dc0918777d43b3f961bd18162866f0bbb.zip CMake-10507c6dc0918777d43b3f961bd18162866f0bbb.tar.gz CMake-10507c6dc0918777d43b3f961bd18162866f0bbb.tar.bz2 |
cmMakefile: Add configurations getter with empty configuration default
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4342e9f..53ed535 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -337,12 +337,8 @@ bool cmGlobalGenerator::CheckTargetsForType() const for (cmGeneratorTarget* target : generator->GetGeneratorTargets()) { if (target->GetType() == cmStateEnums::EXECUTABLE && target->GetPropertyAsBool("WIN32_EXECUTABLE")) { - std::vector<std::string> configs; - target->Makefile->GetConfigurations(configs); - if (configs.empty()) { - configs.emplace_back(); - } - + std::vector<std::string> const& configs = + target->Makefile->GetGeneratorConfigs(); for (std::string const& config : configs) { if (target->GetLinkerLanguage(config) == "Swift") { this->GetCMakeInstance()->IssueMessage( @@ -2963,11 +2959,8 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) // List the source files with any per-source labels. fout << "# Source files and their labels\n"; std::vector<cmSourceFile*> sources; - std::vector<std::string> configs; - target->Target->GetMakefile()->GetConfigurations(configs); - if (configs.empty()) { - configs.emplace_back(); - } + std::vector<std::string> const& configs = + target->Target->GetMakefile()->GetGeneratorConfigs(); for (std::string const& c : configs) { target->GetSourceFiles(sources, c); } |