diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:35:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:36:13 +0300 |
| commit | 7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch) | |
| tree | e99050b05bf97b20cc0f5c05ea549aa31d8fba09 /build_files | |
| parent | d94df18550702a9df7b56feb5d58fb20effb7536 (diff) | |
| parent | c68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 3 | ||||
| -rw-r--r-- | build_files/windows/configure_msbuild.cmd | 7 | ||||
| -rw-r--r-- | build_files/windows/reset_variables.cmd | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index f55178b89e2..0ee0845be33 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -31,7 +31,8 @@ endif() if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(MSVC_CLANG On) - set(MSVC_REDIST_DIR $ENV{VCToolsRedistDir}) + set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables") + set(MSVC_REDIST_DIR ${VC_TOOLS_DIR}) if (DEFINED MSVC_REDIST_DIR) file(TO_CMAKE_PATH ${MSVC_REDIST_DIR} MSVC_REDIST_DIR) else() 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= |