mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

CMakePresets.json: Don't use architecture and toolset if empty

Browse Source 
Fixes: #24864
This commit is contained in:
Kyle Edwards
2023-12-19 10:19:03 -05:00
parent bee73bce08
commit 0654051dde
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+3 -2
View File
@@ -1576,14 +1576,15 @@ void cmake::SetArgs(const std::vector<std::string>& args)
if (!expandedPreset->ArchitectureStrategy || if (!expandedPreset->ArchitectureStrategy ||
expandedPreset->ArchitectureStrategy == expandedPreset->ArchitectureStrategy ==
cmCMakePresetsGraph::ArchToolsetStrategy::Set) { cmCMakePresetsGraph::ArchToolsetStrategy::Set) {
if (!this->GeneratorPlatformSet) { if (!this->GeneratorPlatformSet &&
!expandedPreset->Architecture.empty()) {
this->SetGeneratorPlatform(expandedPreset->Architecture); this->SetGeneratorPlatform(expandedPreset->Architecture);
} }
} }
if (!expandedPreset->ToolsetStrategy || if (!expandedPreset->ToolsetStrategy ||
expandedPreset->ToolsetStrategy == expandedPreset->ToolsetStrategy ==
cmCMakePresetsGraph::ArchToolsetStrategy::Set) { cmCMakePresetsGraph::ArchToolsetStrategy::Set) {
if (!this->GeneratorToolsetSet) { if (!this->GeneratorToolsetSet && !expandedPreset->Toolset.empty()) {
this->SetGeneratorToolset(expandedPreset->Toolset); this->SetGeneratorToolset(expandedPreset->Toolset);
} }
} }