]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
CMAKE windows: allow bootstrapping with more recent cmake versions
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 13 Oct 2022 12:22:12 +0000 (14:22 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 13 Oct 2022 12:22:12 +0000 (14:22 +0200)
products/compil_scripts/cmake.bat

index eb16a00151951692677cf40c8d7edb57f4356ebb..f6d11815d2a5ca351e39f41856733c088df4854f 100644 (file)
@@ -29,11 +29,16 @@ set MSBUILDDISABLENODEREUSE=1
 
 cd %BUILD_DIR%
 
+REM bootstrap either with the Visual embedded Cmake or one external
+IF NOT DEFINED CMAKE_PRODUCT_EXECUTABLE (
+  SET CMAKE_PRODUCT_EXECUTABLE=cmake
+)
+
 echo.
 echo --------------------------------------------------------------------------
-echo cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+echo %CMAKE_PRODUCT_EXECUTABLE%  %CMAKE_OPTIONS% %SOURCE_DIR%
 echo --------------------------------------------------------------------------
-cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_PRODUCT_EXECUTABLE% %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
     echo "ERROR on cmake"
     exit 1