diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index 3fcb60adbbe..469858e6c50 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -130,6 +130,21 @@ echo ---------------------------------------------------------- echo ---------------------------------------------------------- echo. +::Check if make.bat or make.exe exists, and set CMAKE_MAKE_PROGRAM accordingly +set CMAKE_MAKE_PROGRAM= +for /f "delims=" %%i in ('where make.bat 2^>nul') do set CMAKE_MAKE_PROGRAM=%%i +if not defined CMAKE_MAKE_PROGRAM ( + for /f "delims=" %%i in ('where make.exe 2^>nul') do set CMAKE_MAKE_PROGRAM=%%i +) +if not defined CMAKE_MAKE_PROGRAM ( + echo Error: Neither make.bat nor make.exe found in PATH. + exit /b 1 +) + +echo. +echo make proram is %CMAKE_MAKE_PROGRAM% +echo. + set BUILDDIR=%LIB_REPO%\src\cmbuild cd %BUILDDIR% cmake ..\ ^ @@ -138,6 +153,7 @@ cmake ..\ ^ -DCMAKE_C_COMPILER=icx ^ -DCMAKE_C_FLAGS="/DWIN32 -O3 /fp:precise" ^ -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ^ +-DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^ -DCMAKE_INSTALL_LIBDIR="lib" echo. diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index c2e47762dba..4bb80a10e70 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -110,6 +110,21 @@ echo ---------------------------------------------------------- echo ---------------------------------------------------------- echo. +::Check if make.bat or make.exe exists, and set CMAKE_MAKE_PROGRAM accordingly +set CMAKE_MAKE_PROGRAM= +for /f "delims=" %%i in ('where make.bat 2^>nul') do set CMAKE_MAKE_PROGRAM=%%i +if not defined CMAKE_MAKE_PROGRAM ( + for /f "delims=" %%i in ('where make.exe 2^>nul') do set CMAKE_MAKE_PROGRAM=%%i +) +if not defined CMAKE_MAKE_PROGRAM ( + echo Error: Neither make.bat nor make.exe found in PATH. + exit /b 1 +) + +echo. +echo make proram is %CMAKE_MAKE_PROGRAM% +echo. + cmake ..\ ^ -G "MinGW Makefiles" ^ -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" ^ @@ -123,6 +138,7 @@ cmake ..\ ^ -DENABLE_OPENMP=ON ^ -DBUILD_SHARED_LIBS=OFF ^ -DCMAKE_INSTALL_LIBDIR="lib" ^ +-DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^ -DCMAKE_C_FLAGS_RELEASE="${CMAKE_C_FLAGS_RELEASE} /MT" ^ -DCMAKE_C_FLAGS_DEBUG="${CMAKE_C_FLAGS_DEBUG} /MTd"