File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed
Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ if not exist "%CMAKE%" goto CMakeNotFound
5656if 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
6060for /F " tokens=1 delims=." %%G in (" %CMAKE_VER% " ) do set CMAKE_VN_MAJOR = %%G
6161echo 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
7877for %%a in (..\WindowsCompileDeps\include) do set INCLUDE_DIR = %%~fa
7978for %%a in (..\WindowsCompileDeps\%CPU_PLATFORM% \Release\lib) do set LIB_DIR = %%~fa
You can’t perform that action at this time.
0 commit comments