[Bf-blender-cvs] [412cd801b98] temp-usd-test-cmake-install-prefix: Fix USD unit test on buildbot

Sybren A. Stüvel noreply at git.blender.org
Mon Jul 27 18:36:30 CEST 2020


Commit: 412cd801b98ab85646b100b12926a259fd21f513
Author: Sybren A. Stüvel
Date:   Mon Jul 27 18:36:19 2020 +0200
Branches: temp-usd-test-cmake-install-prefix
https://developer.blender.org/rB412cd801b98ab85646b100b12926a259fd21f513

Fix USD unit test on buildbot

The buildbot uses a separate `CMAKE_INSTALL_PREFIX`. This means that
the unit test could not find its USD JSON files in the build directory.
Using `${CMAKE_INSTALL_PREFIX}` instead of `$<TARGET_FILE_DIR:blender>`
solved this.

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

M	tests/gtests/runner/CMakeLists.txt

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

diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt
index 4da0bce09a4..18d8f57364f 100644
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@@ -69,5 +69,5 @@ gtest_discover_tests(blender_test
   # 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}"
 )



More information about the Bf-blender-cvs mailing list