diff options
author | Ray Molenkamp <github@lazydodo.com> | 2021-03-30 04:11:17 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2021-03-30 04:11:17 +0300 |
commit | f9eaf93d37957fb29eefb720022edd988c540369 (patch) | |
tree | 00c3913978394a63679b1b947793e6b8b3d7f500 /build_files/windows | |
parent | 6c33d3d01b6237cbe854b1d6ca54ac9680bb0563 (diff) |
MSVC: ASAN support for VS 16.9
This enables ASAN support when used with VS 16.9
enable as usual in cmake with the WITH_COMPILER_ASAN
option, or when using make.bat just tag on `asan'
to the invocation, ie: `make lite 2019 asan`
MSVC: Asan support for 16.9
This enables ASAN support when used with VS 16.9
enable as usual in cmake with the WITH_COMPILER_ASAN
option, or when using make.bat just tag on `asan'
to the invocation, ie: `make lite 2019 asan`
Differential Revision: https://developer.blender.org/D7794
Reviewed By: brecht, sergey
Diffstat (limited to 'build_files/windows')
-rw-r--r-- | build_files/windows/configure_msbuild.cmd | 10 | ||||
-rw-r--r-- | build_files/windows/configure_ninja.cmd | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/build_files/windows/configure_msbuild.cmd b/build_files/windows/configure_msbuild.cmd index 4956f1e3ea1..be69f99a8e8 100644 --- a/build_files/windows/configure_msbuild.cmd +++ b/build_files/windows/configure_msbuild.cmd @@ -9,14 +9,10 @@ if "%BUILD_WITH_SCCACHE%"=="1" ( if "%WITH_CLANG%"=="1" ( set CLANG_CMAKE_ARGS=-T"llvm" - if "%WITH_ASAN%"=="1" ( +) + +if "%WITH_ASAN%"=="1" ( set ASAN_CMAKE_ARGS=-DWITH_COMPILER_ASAN=On - ) -) else ( - if "%WITH_ASAN%"=="1" ( - echo ASAN is only supported with clang. - exit /b 1 - ) ) if "%WITH_PYDEBUG%"=="1" ( diff --git a/build_files/windows/configure_ninja.cmd b/build_files/windows/configure_ninja.cmd index d68d94a3bcf..90085feb2bd 100644 --- a/build_files/windows/configure_ninja.cmd +++ b/build_files/windows/configure_ninja.cmd @@ -46,16 +46,10 @@ set LLVM_DIR= set CFLAGS=-m64 -fmsc-version=1914 set CXXFLAGS=-m64 -fmsc-version=1914 ) - if "%WITH_ASAN%"=="1" ( - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On - ) ) if "%WITH_ASAN%"=="1" ( - if "%WITH_CLANG%" == "" ( - echo ASAN is only supported with clang. - exit /b 1 - ) + set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On ) if NOT "%verbose%" == "" ( |