Skip to content

Commit 90858be

Browse files
committed
Restore CMake version check
1 parent 4e7a1cf commit 90858be

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

cmake-build-x64.bat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if not exist "%CMAKE%" goto CMakeNotFound
5656
if not exist "%LUXCORE_ROOT%" goto LuxCoreNotFound
5757

5858
:: Determine if we have CMake 2 or 3
59-
for /F "tokens=3" %%G in ('cmd /c "%CMAKE%" --version ^| find "cmake version"') do set CMAKE_VER=%%G
59+
for /F "tokens=3" %%G in ('cmd /c "%CMAKE%" --version ^| findstr /I /C:"cmake version"') do set CMAKE_VER=%%G
6060
for /F "tokens=1 delims=." %%G in ("%CMAKE_VER%") do set CMAKE_VN_MAJOR=%%G
6161
echo We are using CMake version: %CMAKE_VN_MAJOR%
6262
:: Default values
@@ -69,11 +69,10 @@ if "%CPU_PLATFORM%"=="x64" (
6969
set CMAKE_TOOLSET=
7070
)
7171

72-
:: temporarily disabled this check because of different behaviour on Azure pipelines
73-
:: if %CMAKE_VN_MAJOR%==2 (
74-
:: echo You need CMake 3.7 or better to build LuxCoreRender
75-
:: goto CMakeNotFound
76-
:: )
72+
if %CMAKE_VN_MAJOR%==2 (
73+
echo You need CMake 3.11 or better to build LuxCoreRender
74+
goto CMakeNotFound
75+
)
7776

7877
for %%a in (..\WindowsCompileDeps\include) do set INCLUDE_DIR=%%~fa
7978
for %%a in (..\WindowsCompileDeps\%CPU_PLATFORM%\Release\lib) do set LIB_DIR=%%~fa

0 commit comments

Comments
 (0)