Browse Source

Merge topic 'ccmake_support_preset_toolchain'

d20c21a678 ccmake: Now supports the preset toolchain entry

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Acked-by: Alex <[email protected]>
Merge-request: !9127
Brad King 1 year ago
parent
commit
601e16c7c5
1 changed files with 5 additions and 0 deletions
  1. 5 0
      Source/CursesDialog/cmCursesMainForm.cxx

+ 5 - 0
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;