make.bat : Fix clang+asan msbuild project generation
authorRay Molenkamp <github@lazydodo.com>
Tue, 5 Jun 2018 04:35:57 +0000 (22:35 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 5 Jun 2018 04:35:57 +0000 (22:35 -0600)
build_files/windows/configure_msbuild.cmd
build_files/windows/reset_variables.cmd

index eee21f568bea5d35509b4f3c422ae4fc3d773c0d..f8c2a87de8e5616a8e7059c8a1b7940bdc277a53 100644 (file)
@@ -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%
index f933729b91ce3804c4a998b0d80df51dc8b625cd..a522ed7407f8a984365716a0d82dee51f198adb4 100644 (file)
@@ -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=