diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-11 10:49:54 -0500 |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-11 10:49:54 -0500 |
| commit | 46c836644d2566e2a568318e5676eaa08f65501e (patch) | |
| tree | 1d9793be36aa666cda329558d8ea629c84753f83 /Source/cmGlobalNinjaGenerator.h | |
| parent | 0db0b721564a584ff1783ac2cf14db6fd867d6b2 (diff) | |
| download | cmake-46c836644d2566e2a568318e5676eaa08f65501e.tar.gz | |
Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS
Prior to this fix, CMAKE_NMC_DEFAULT_CONFIGS would inherit "all" from
the union of CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG and
CMAKE_NMC_CROSS_CONFIGS. This is inconsistent with the behavior of the
"all" target signifying CMAKE_NMC_CROSS_CONFIGS. Update "all" in
CMAKE_NMC_DEFAULT_CONFIGS to inherit only from CMAKE_NMC_CROSS_CONFIGS.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index a59859e205..3db8356167 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -427,7 +427,7 @@ protected: const std::string& name); static cm::optional<std::set<std::string>> ListSubsetWithAll( - const std::set<std::string>& defaults, + const std::set<std::string>& all, const std::set<std::string>& defaults, const std::vector<std::string>& items); virtual bool InspectConfigTypeVariables() { return true; } |