Pārlūkot izejas kodu

ccmake: Now supports the preset toolchain entry

Previously the toolchain field was ignored when passing a preset
to ccmake.
Robert Maynard 1 gadu atpakaļ
vecāks
revīzija
d20c21a678
1 mainītis faili ar 5 papildinājumiem un 0 dzēšanām
  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;