[Bf-blender-cvs] [e8869d9c711] master: Merge remote-tracking branch 'origin/blender-v2.90-release'

[Sybren A. Stüvel]

Commit: e8869d9c7110f17c5fed6929410273d8a8105808
Author: Sybren A. Stüvel
Date:   Mon Jul 27 19:02:44 2020 +0200
Branches: master
https://developer.blender.org/rBe8869d9c7110f17c5fed6929410273d8a8105808

Merge remote-tracking branch 'origin/blender-v2.90-release'

===================================================================



===================================================================

diff --cc tests/gtests/runner/CMakeLists.txt
index 8f9bc225678,18d8f57364f..59537aab571
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@@@ -77,10 -66,8 +77,10 @@@ set(_GOOGLETEST_DISCOVER_TESTS_SCRIP
  )
  
  gtest_discover_tests(blender_test
 -  # So that unit tests know where to find files:
 +# So that the binary can find its shared libs on window.
 +  WORKING_DIRECTORY "$<TARGET_FILE_DIR:blender>"
 +# So that unit tests know where to find files:
    EXTRA_ARGS
      --test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests"
-     --test-release-dir "$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION}"
+     --test-release-dir "${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}"
  )