diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-16 13:19:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-16 13:19:48 (GMT) |
| commit | 3b9492204a5dcad4fd23dd2f646e66cca7ed298e (patch) | |
| tree | 4b9cad0e97f0b4d336589524533d15bd91cc4675 /Source/cmMakefile.cxx | |
| parent | eee8fc40c9e2bd7c3b58fcb020356c42cb79eb81 (diff) | |
| parent | b9cb1d324d500e5b26afee33b6cd565e02117319 (diff) | |
| download | CMake-3b9492204a5dcad4fd23dd2f646e66cca7ed298e.zip CMake-3b9492204a5dcad4fd23dd2f646e66cca7ed298e.tar.gz CMake-3b9492204a5dcad4fd23dd2f646e66cca7ed298e.tar.bz2 | |
Merge topic 'fix-refactor-generator-configs'
b9cb1d324d Fix regression in test/install/package configuration selection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5381
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c366b48..22594bd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3185,10 +3185,9 @@ std::vector<std::string> cmMakefile::GetGeneratorConfigs( GeneratorConfigQuery mode) const { std::vector<std::string> configs; - if (this->GetGlobalGenerator()->IsMultiConfig() || - mode == cmMakefile::OnlyMultiConfig) { + if (this->GetGlobalGenerator()->IsMultiConfig()) { this->GetDefExpandList("CMAKE_CONFIGURATION_TYPES", configs); - } else { + } else if (mode != cmMakefile::OnlyMultiConfig) { const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); if (!buildType.empty()) { configs.emplace_back(buildType); |