Fix: Blender_test not working on windows.
This bumps the minimum requirement for cmake from 3.10 to 3.18 on windows if `WITH_GTESTS` is enabled. Reviewed By: sergey brecht sybren campbellbarton Differential Revision: https://developer.blender.org/D8405
This commit is contained in:
parent
848cbe889b
commit
44928a2a8f
|
@ -26,6 +26,10 @@ 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")
|
||||
|
|
|
@ -77,10 +77,11 @@ set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT
|
|||
)
|
||||
|
||||
gtest_discover_tests(blender_test
|
||||
# So that the binary can find its shared libs on window.
|
||||
WORKING_DIRECTORY "$<TARGET_FILE_DIR:blender>"
|
||||
WORKING_DIRECTORY "${TEST_INSTALL_DIR}"
|
||||
# So that it will run after the install phase that will copy the required libraries
|
||||
DISCOVERY_MODE PRE_TEST
|
||||
# So that unit tests know where to find files:
|
||||
EXTRA_ARGS
|
||||
--test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests"
|
||||
--test-release-dir "${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}"
|
||||
--test-release-dir "${TEST_INSTALL_DIR}/${BLENDER_VERSION}"
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue