Merge pull request #36 from sourcehold/feature/extract-cmake-finder-in-own-script

[PROJECT] Add cmake helper script

Author: gynt

README.md

@@ -65,8 +65,7 @@ Visual Studio Code with the proper extensions only needs to open the folder and
 Additionally, it configures format-on-save and a debug target for the UCP3.
 
 If the scripts are preferred, the following triggers a build using the scripts:
-
-1. Open a terminal. If the Visual Studio CMake version is used, it needs to be the CMD developer command prompt.
+1. Open a terminal.
 2. Navigate to this project folder
 3. Execute build.bat:
    ```sh
@@ -77,9 +76,14 @@ If the scripts are preferred, the following triggers a build using the scripts:
    reccmp/run reccmp-reccmp --target STRONGHOLDCRUSADER --verbose 0x401000
    ```
 
+If CMake is installed and not in PATH, for example if installed via Visual Studio, `cmakew.bat` can be used instead. It tries to detect a CMake installation and uses it.
+
 Note that any code needs to be formatted properly using the provided `clang-format`. The way to do so it up to the developer. Many IDEs support it out of the box.
 
-Should any files be added to the source code in `src/core` or the ucp files in `ucp`, the cmake script [create-include-lists.cmake](create-include-lists.cmake) needs to be rerun and the changed list files need to be committed.
+Should any files be added to the source code in `src/core` or the ucp files in `ucp`, the cmake script [create-include-lists.cmake](create-include-lists.cmake) needs to be rerun and the changed list files need to be committed:
+```bat
+.\cmakew -P create-include-lists.cmake
+```
 
 #### Manual configuration
 

build.bat

@@ -13,30 +13,6 @@ if "%~1"=="" (
 set "PRESET=%~1"
 set "TARGET=%~2"
 
-:: --- Check for cmake ---
-where cmake >nul 2>nul
-if errorlevel 1 (
-    echo [INFO]  Auto-detecting cmake location using vswhere.
-    if not exist "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" (
-        echo [ERROR] 'vswhere' not found, cannot locate 'cmake'.
-        exit /b 1
-    )
-    FOR /F "tokens=* USEBACKQ" %%g IN (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath -requires Microsoft.VisualStudio.Component.VC.CMake.Project`) do (
-        SET "CMAKE=%%g\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin"
-    )
-    if not exist "!CMAKE!" (
-        FOR /F "tokens=* USEBACKQ" %%g IN (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath -requires Microsoft.VisualStudio.Component.VC.CMake.Project -products Microsoft.VisualStudio.Product.BuildTools` ) do (
-            SET "CMAKE=%%g\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin"
-        )
-    )
-    if not exist "!CMAKE!" (
-        echo [ERROR] 'cmake' is not found in PATH and not found using vswhere.
-        exit /b 1
-    )
-    echo [INFO]  Detected: "!CMAKE!"
-    set "PATH=!CMAKE!;%PATH%"
-)
-
 :: --- Kill mspdbsrv.exe if it's running ---
 tasklist | find /I "mspdbsrv.exe" >nul
 if not errorlevel 1 (
@@ -49,7 +25,7 @@ if not errorlevel 1 (
 
 :: --- Run cmake configure using preset ---
 echo [INFO] Configuring with preset "%PRESET%"...
-cmake --preset "%PRESET%"
+call .\cmakew --preset "%PRESET%"
 if errorlevel 1 (
     echo [ERROR] CMake configure failed for preset "%PRESET%".
     exit /b 1
@@ -58,15 +34,15 @@ if errorlevel 1 (
 :: --- Run cmake build using preset ---
 if "%TARGET%"=="" (
     echo [INFO] Building preset "%PRESET%" with default target...
-    cmake --build --preset "%PRESET%"
+    call .\cmakew --build --preset "%PRESET%"
     if errorlevel 1 (
         echo [ERROR] CMake build failed for preset "%PRESET%".
         exit /b 1
     )
     echo Build completed successfully for preset "%PRESET%".
 ) else (
     echo [INFO] Building preset "%PRESET%" with target "%TARGET%"...
-    cmake --build --preset "%PRESET%" --target "%TARGET%"
+    call .\cmakew --build --preset "%PRESET%" --target "%TARGET%"
     if errorlevel 1 (
         echo [ERROR] CMake build failed for preset "%PRESET%" target "%TARGET%".
         exit /b 1

cmakew.bat

@@ -0,0 +1,37 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+:: --- Check if cmake is in PATH ---
+where cmake >nul 2>nul
+if errorlevel 1 (
+    echo [INFO] Auto-detecting cmake location using vswhere.
+
+    if not exist "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" (
+        echo [ERROR] 'vswhere' not found, cannot locate 'cmake'.
+        exit /b 1
+    )
+
+    :: Try to locate CMake in latest VS installation
+    FOR /F "tokens=* USEBACKQ" %%g IN (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath -requires Microsoft.VisualStudio.Component.VC.CMake.Project`) do (
+        SET "CMAKE=%%g\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin"
+    )
+
+    :: If not found, try latest Build Tools installation
+    if not exist "!CMAKE!" (
+        FOR /F "tokens=* USEBACKQ" %%g IN (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath -requires Microsoft.VisualStudio.Component.VC.CMake.Project -products Microsoft.VisualStudio.Product.BuildTools`) do (
+            SET "CMAKE=%%g\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin"
+        )
+    )
+
+    if not exist "!CMAKE!" (
+        echo [ERROR] 'cmake' not found in PATH and not found using vswhere.
+        exit /b 1
+    )
+
+    echo [INFO] Detected: "!CMAKE!"
+    set "PATH=!CMAKE!;%PATH%"
+)
+
+:: --- Proxy all arguments to actual CMake ---
+cmake %*
+exit /b %errorlevel%