Commit: 88b46a6ce9694a3d1ab3d9df27c019b70fa3ac51
Author: Ray Molenkamp
Date: Mon Jun 4 22:35:57 2018 -0600
Branches: master
https://developer.blender.org/rB88b46a6ce9694a3d1ab3d9df27c019b70fa3ac51
make.bat : Fix clang+asan msbuild project generation
===================================================================
M build_files/windows/configure_msbuild.cmd
M build_files/windows/reset_variables.cmd
===================================================================
diff --git a/build_files/windows/configure_msbuild.cmd
b/build_files/windows/configure_msbuild.cmd
index eee21f568be..f8c2a87de8e 100644
--- a/build_files/windows/configure_msbuild.cmd
+++ b/build_files/windows/configure_msbuild.cmd
@@ -1,5 +1,3 @@
-set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER%
%BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS%
-
if "%BUILD_ARCH%"=="x64" (
set MSBUILD_PLATFORM=x64
) else if "%BUILD_ARCH%"=="x86" (
@@ -11,9 +9,9 @@ if "%BUILD_ARCH%"=="x64" (
)
if "%WITH_CLANG%"=="1" (
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -T"LLVM-vs2017"
+ set CLANG_CMAKE_ARGS=-T"LLVM-vs2017"
if "%WITH_ASAN%"=="1" (
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On
+ set ASAN_CMAKE_ARGS=-DWITH_COMPILER_ASAN=On
)
) else (
if "%WITH_ASAN%"=="1" (
@@ -21,6 +19,7 @@ if "%WITH_CLANG%"=="1" (
exit /b 1
)
)
+set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER%
%BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS% %CLANG_CMAKE_ARGS%
%ASAN_CMAKE_ARGS%
if NOT EXIST %BUILD_DIR%\nul (
mkdir %BUILD_DIR%
diff --git a/build_files/windows/reset_variables.cmd
b/build_files/windows/reset_variables.cmd
index f933729b91c..a522ed7407f 100644
--- a/build_files/windows/reset_variables.cmd
+++ b/build_files/windows/reset_variables.cmd
@@ -22,4 +22,6 @@ set BUILD_SHOW_HASHES=
set SHOW_HELP=
set BUILD_WITH_NINJA=
set WITH_CLANG=
-set WITH_ASAN=
\ No newline at end of file
+set WITH_ASAN=
+set CLANG_CMAKE_ARGS=
+set ASAN_CMAKE_ARGS=
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
