diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2021-04-26 15:51:27 (GMT) |
|---|---|---|
| committer | Robert Maynard <rmaynard@nvidia.com> | 2021-04-28 21:22:25 (GMT) |
| commit | a9b968bb9894902e2183a4aea4c23701d5666733 (patch) | |
| tree | b41ad0388074d1ea666f0e210e69ec389f3d2ff7 /Source/cmake.cxx | |
| parent | 0eb42defc222372b660983ac46ea1266543af7e0 (diff) | |
| download | CMake-a9b968bb9894902e2183a4aea4c23701d5666733.zip CMake-a9b968bb9894902e2183a4aea4c23701d5666733.tar.gz CMake-a9b968bb9894902e2183a4aea4c23701d5666733.tar.bz2 | |
cmake-presets: Introduce `toolchainFile` preset option
In v3 of the presets, the `--toolchain` command line argument now
has a preset mapping.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d24e268..4130f5f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1257,6 +1257,13 @@ void cmake::SetArgs(const std::vector<std::string>& args) "PATH", expandedPreset->InstallDir }; } + if (!expandedPreset->ToolchainFile.empty() && + this->State->GetInitializedCacheValue("CMAKE_TOOLCHAIN_FILE") == + nullptr) { + this->UnprocessedPresetVariables["CMAKE_TOOLCHAIN_FILE"] = { + "FILEPATH", expandedPreset->ToolchainFile + }; + } if (!expandedPreset->ArchitectureStrategy || expandedPreset->ArchitectureStrategy == |