FDS Build: Correction with CMake version check for Windows.

Author: Paul

Build/Scripts/HYPRE/build_hypre.bat

@@ -20,14 +20,6 @@ call :is_file_installed cmake || set abort=1
 call :is_file_installed make  || set abort=1
 if %abort% == 1 exit /b
 
-echo Running CMake version check...
-call ../check_cmake_version.bat
-if errorlevel 1 (
-    echo Exiting due to CMake version error.
-    exit /b 1
-)
-echo Proceeding with build...
-
 set CURDIR=%CD%
 
 ::*** define root directory where fds repo and libs directories are located
@@ -84,6 +76,15 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
+echo Running CMake version check...
+call %CURDIR%/../check_cmake_version.bat
+if errorlevel 1 (
+    echo Exiting due to CMake version error.
+    pause
+    exit /b 1
+)
+echo Proceeding with build...
+
 echo.
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------

Build/Scripts/check_cmake_version.bat

@@ -3,35 +3,36 @@ setlocal enabledelayedexpansion
 
 set REQUIRED_MAJOR=3
 set REQUIRED_MINOR=21
+set VERSION_STRING=%REQUIRED_MAJOR%.%REQUIRED_MINOR%.0
 
 :: Check if cmake is installed
 where cmake >nul 2>nul
 if errorlevel 1 (
-    echo Error: CMake is not installed. Please install CMake version 3.21.0 or newer.
+    echo Error: CMake is not installed. Please install CMake version %VERSION_STRING% or newer.
     exit /b 1
 )
 
-:: Get installed cmake version
-for /f "tokens=3" %%v in ('cmake --version') do (
+:: Extract the version number
+for /f "tokens=3" %%v in ('cmake --version ^| findstr /i "version"') do (
     set VERSION=%%v
-    goto :parse_version
 )
 
-:parse_version
+:: Parse version into major, minor, patch
 for /f "tokens=1,2,3 delims=." %%a in ("!VERSION!") do (
     set MAJOR=%%a
     set MINOR=%%b
     set PATCH=%%c
 )
 
-:: Compare version
+:: Compare major version
 if !MAJOR! LSS %REQUIRED_MAJOR% (
-    echo Error: Installed CMake version is !VERSION!. Version 3.21.0 or newer is required.
+    echo Error: Installed CMake version is !VERSION!. Version %VERSION_STRING% or newer is required.
     exit /b 1
 )
 
+:: Compare minor version if major matches
 if !MAJOR! EQU %REQUIRED_MAJOR% if !MINOR! LSS %REQUIRED_MINOR% (
-    echo Error: Installed CMake version is !VERSION!. Version 3.21.0 or newer is required.
+    echo Error: Installed CMake version is !VERSION!. Version %VERSION_STRING% or newer is required.
     exit /b 1
 )