diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-06 18:48:08 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-06 19:31:13 (GMT) |
| commit | 1844be451e2c27129fbdff9aed121c1b6395c1d0 (patch) | |
| tree | 0a4ea5391b03b4fb89a169154dc69d4c3a215874 /Source | |
| parent | 13ef3285df97fa97a4cc1b7fe81741aeb8adcf7a (diff) | |
| download | CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.zip CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.tar.gz CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.tar.bz2 | |
Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG
Fix an issue where CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG is specified
and CMAKE_NMC_CROSS_CONFIGS is not, which results in a false error
with CMAKE_NMC_DEFAULT_CONFIGS.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index ff1e5d6..c7bc8bf 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -2657,6 +2657,7 @@ bool cmGlobalNinjaMultiGenerator::ReadCacheEntriesForBuild( defaultConfigsString = this->DefaultFileConfig; } if (!defaultConfigsString.empty() && + defaultConfigsString != this->DefaultFileConfig && (this->DefaultFileConfig.empty() || this->CrossConfigs.empty())) { std::ostringstream msg; msg << "CMAKE_NMC_DEFAULT_CONFIGS cannot be used without " |