diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-05 15:20:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-05 15:20:39 (GMT) |
| commit | 601e16c7c5146fa6bbd92ec28ed792782cdf1033 (patch) | |
| tree | 06431586e24bf277b7b5c1b666de4b3922d5d3f3 /Source | |
| parent | 02eb4c0a2ac8234fedcba83bbbc132580f76751e (diff) | |
| parent | d20c21a678f52e1b8f61d5ebdec311efa9a930bb (diff) | |
| download | CMake-601e16c7c5146fa6bbd92ec28ed792782cdf1033.zip CMake-601e16c7c5146fa6bbd92ec28ed792782cdf1033.tar.gz CMake-601e16c7c5146fa6bbd92ec28ed792782cdf1033.tar.bz2 | |
Merge topic 'ccmake_support_preset_toolchain'
d20c21a678 ccmake: Now supports the preset toolchain entry
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9127
Diffstat (limited to 'Source')
| -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; |