diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-10-23 10:37:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-23 10:37:56 (GMT) |
| commit | 5e1858c0c2d819412f2ce0ff8e681f54df42ffe6 (patch) | |
| tree | 4f9f893e97b239b4f469159c8bca9e5b5dbc71d2 /Source/cmake.cxx | |
| parent | 761dc324e043a504f6cec26b03bd86eb59c48710 (diff) | |
| parent | 64afabdbcb265acb53a9b8f8cb86465d31f2ca61 (diff) | |
| download | CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.zip CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.tar.gz CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.tar.bz2 | |
Merge topic 'cmake-presets-toolset-arch-config' into release-3.19
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 5b6bd1e..291ce22 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1069,12 +1069,16 @@ void cmake::SetArgs(const std::vector<std::string>& args) this->UnprocessedPresetVariables = expandedPreset->CacheVariables; this->UnprocessedPresetEnvironment = expandedPreset->Environment; - if (!expandedPreset->GeneratorConfig || - expandedPreset->GeneratorConfig == - cmCMakePresetsFile::CMakeGeneratorConfig::Default) { + if (!expandedPreset->ArchitectureStrategy || + expandedPreset->ArchitectureStrategy == + cmCMakePresetsFile::ArchToolsetStrategy::Set) { if (!this->GeneratorPlatformSet) { this->SetGeneratorPlatform(expandedPreset->Architecture); } + } + if (!expandedPreset->ToolsetStrategy || + expandedPreset->ToolsetStrategy == + cmCMakePresetsFile::ArchToolsetStrategy::Set) { if (!this->GeneratorToolsetSet) { this->SetGeneratorToolset(expandedPreset->Toolset); } |