[Bf-blender-cvs] [cd58ce85c24] master: make.bat : check for existence of ninja before using it.
Ray Molenkamp
noreply at git.blender.org
Tue Jun 5 18:40:23 CEST 2018
Commit: cd58ce85c243e6520d796f66807a0caa8e078483
Author: Ray Molenkamp
Date: Tue Jun 5 10:39:39 2018 -0600
Branches: master
https://developer.blender.org/rBcd58ce85c243e6520d796f66807a0caa8e078483
make.bat : check for existence of ninja before using it.
===================================================================
M build_files/windows/configure_ninja.cmd
===================================================================
diff --git a/build_files/windows/configure_ninja.cmd b/build_files/windows/configure_ninja.cmd
index d3b002e9a24..224d761adf6 100644
--- a/build_files/windows/configure_ninja.cmd
+++ b/build_files/windows/configure_ninja.cmd
@@ -1,3 +1,9 @@
+ninja --version 1>NUL 2>&1
+if %ERRORLEVEL% NEQ 0 (
+ echo "Ninja not detected in the path"
+ exit /b 1
+ )
+
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
if "%WITH_CLANG%" == "1" (
More information about the Bf-blender-cvs
mailing list