[Bf-blender-cvs] [32cd311fbae] temp-sybren-usd-patch-02: USD: remove `PXR_PLUGINPATH_NAME` when testing
Sybren A. Stüvel
noreply at git.blender.org
Wed Dec 11 16:36:38 CET 2019
Commit: 32cd311fbaec10c3e33e4fad16bd2740a5176ef4
Author: Sybren A. Stüvel
Date: Wed Dec 11 16:34:16 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rB32cd311fbaec10c3e33e4fad16bd2740a5176ef4
USD: remove `PXR_PLUGINPATH_NAME` when testing
===================================================================
M tests/gtests/usd/CMakeLists.txt
===================================================================
diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt
index 9345e0d573a..a8831b66100 100644
--- a/tests/gtests/usd/CMakeLists.txt
+++ b/tests/gtests/usd/CMakeLists.txt
@@ -69,12 +69,4 @@ BLENDER_SRC_GTEST_EX(
EXTRA_LIBS "${LIB}"
COMMAND_ARGS --test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests")
-# When the PXR_PLUGINPATH_NAME environment variable is defined, the USD library uses it to find its JSON files.
-# This allows the unit tests to run without having to 'make install' Blender.
-get_property(_usd_TEST_ENV
- TEST usd_test
- PROPERTY ENVIRONMENT)
-set_tests_properties(usd_test PROPERTIES ENVIRONMENT "${_usd_TEST_ENV};PXR_PLUGINPATH_NAME=${LIBDIR}/usd/lib/usd")
-unset(_usd_TEST_ENV)
-
setup_liblinks(usd_test)
More information about the Bf-blender-cvs
mailing list