From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 13 Oct 2022 12:22:12 +0000 (+0200)
Subject: CMAKE windows: allow bootstrapping with more recent cmake versions
X-Git-Tag: V9_11_0~237
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=41634212223a8ceffb407968f8fcc963a4f23422;p=tools%2Fsat_salome.git

CMAKE windows: allow bootstrapping with more recent cmake versions
---

diff --git a/products/compil_scripts/cmake.bat b/products/compil_scripts/cmake.bat
index eb16a00..f6d1181 100644
--- a/products/compil_scripts/cmake.bat
+++ b/products/compil_scripts/cmake.bat
@@ -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