From 44928a2a8f2ebb3a9489e21aa3169b20f6945590 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Thu, 30 Jul 2020 13:18:05 -0600 Subject: 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 --- tests/gtests/runner/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/gtests') diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt index 59537aab571..954fcf914a9 100644 --- a/tests/gtests/runner/CMakeLists.txt +++ b/tests/gtests/runner/CMakeLists.txt @@ -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 "$" + 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}" ) -- cgit v1.2.3