diff options
author | Robert Maynard <rmaynard@nvidia.com> | 2024-01-03 19:46:33 (GMT) |
---|---|---|
committer | Robert Maynard <rmaynard@nvidia.com> | 2024-01-03 19:46:33 (GMT) |
commit | d20c21a678f52e1b8f61d5ebdec311efa9a930bb (patch) | |
tree | 9424e1ee41291d077327d1a1a618e3cd570843fb /Source/CursesDialog | |
parent | 275b2cc12f6d766b5e0e9e4ba5ae6532d3f7d817 (diff) | |
download | CMake-d20c21a678f52e1b8f61d5ebdec311efa9a930bb.zip CMake-d20c21a678f52e1b8f61d5ebdec311efa9a930bb.tar.gz CMake-d20c21a678f52e1b8f61d5ebdec311efa9a930bb.tar.bz2 |
ccmake: Now supports the preset toolchain entry
Previously the toolchain field was ignored when passing a preset
to ccmake.
Diffstat (limited to 'Source/CursesDialog')
-rw-r--r-- | Source/CursesDialog/cmCursesMainForm.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index 77a0048..72460f3 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -962,6 +962,11 @@ int cmCursesMainForm::LoadCache(const char* /*unused*/) if (r < 0) { return r; } + + // Process presets before loading the cache + this->CMakeInstance->ProcessPresetVariables(); + this->CMakeInstance->ProcessPresetEnvironment(); + this->CMakeInstance->SetCacheArgs(this->Args); this->CMakeInstance->PreLoadCMakeFiles(); return r; |