diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-06 13:27:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-06 13:28:11 (GMT) |
| commit | a4cfc7d03cc9988fff89f4a1fcc9e495c609d243 (patch) | |
| tree | 678a9b9eec45efe687bfc333485680a4c7fa8971 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | ab46e71eeb7da390a5b18176d1fbf95233fa0e3e (diff) | |
| parent | 7a969fe21d736b6c6755b5dc7a105f1427242cdd (diff) | |
| download | CMake-a4cfc7d03cc9988fff89f4a1fcc9e495c609d243.zip CMake-a4cfc7d03cc9988fff89f4a1fcc9e495c609d243.tar.gz CMake-a4cfc7d03cc9988fff89f4a1fcc9e495c609d243.tar.bz2 | |
Merge topic 'refactor-generator-configs'
7a969fe21d cmMakefile: Refactor API to better handle empty config values
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4957
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 074d981..656a346 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1080,11 +1080,8 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen) this->CurrentMakefile = gen->GetMakefile(); // Select the current set of configuration types. - this->CurrentConfigurationTypes.clear(); - this->CurrentMakefile->GetConfigurations(this->CurrentConfigurationTypes); - if (this->CurrentConfigurationTypes.empty()) { - this->CurrentConfigurationTypes.emplace_back(); - } + this->CurrentConfigurationTypes = + this->CurrentMakefile->GetGeneratorConfigs(cmMakefile::IncludeEmptyConfig); } struct cmSourceFilePathCompare |