diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-07-31 15:26:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-07-31 15:41:13 +0300 |
| commit | 81caec8c609891fea21d04bdfbecb3a0739bc06e (patch) | |
| tree | 8edb7f076576a540c64036d394809f80cfa2ca07 /build_files/cmake/platform/platform_win32.cmake | |
| parent | 5628aaeee1b678c58c67afbbe7d91565f45618a0 (diff) | |
Fix blender_test runner build on the buildbot on Linux and macOS
Add our own copy of the gtest discovery scripts from CMake a few reasons:
* Use the very latest version which supports PRE_TEST for Windows
* Fix usage of [] symbols in file paths that fail with the zsh shell
* Disable asan leak checker when discovering tests
This means Windows also no longer requires the very latest CMake 3.18.
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index ebafe92c962..01d48364435 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -26,10 +26,6 @@ if(NOT MSVC) message(FATAL_ERROR "Compiler is unsupported") endif() -if(WITH_GTESTS AND ${CMAKE_VERSION} VERSION_LESS "3.18.0") - message(FATAL_ERROR "CMake 3.18.0 is required for building WITH_GTESTS on windows, currently installed cmake version is ${CMAKE_VERSION}") -endif() - if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(MSVC_CLANG On) set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables") |