Skip to content

EMSUSD-2915 - removing absolute rpaths #4392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

EMSUSD-2915 - removing absolute rpaths #4392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion plugin/al/plugin/AL_USDMayaTestPlugin/py/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,19 @@ mayaUsd_add_test(TestALUSDMayaPython_LayerManager
"LD_LIBRARY_PATH=${ADDITIONAL_LD_LIBRARY_PATH}"
)

# In Maya 2024 mayapy was changed to an executable script file which adds
# the lib path the LD_LIBRARY_PATH. For Maya 2023 (and below) we need to
# mimic that here so that tests can find Maya libs. Normally this is
# handled by maya.standalone.initialize() but this test is run no standalone.
if (IS_LINUX AND MAYA_APP_VERSION VERSION_LESS_EQUAL 2023)
get_filename_component(MAYAPY_EXE_PATH ${MAYA_PY_EXECUTABLE} DIRECTORY)
set(MAYA_LIB_PATH "${MAYAPY_EXE_PATH}/../lib")
endif()

mayaUsd_add_test(TestALUSDMayaPython_ImportModule
PYTHON_MODULE testUSDMayaPythonModuleOnly
ENV
"${PXR_OVERRIDE_PLUGINPATH_NAME}=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
"LD_LIBRARY_PATH=${ADDITIONAL_LD_LIBRARY_PATH}"
"LD_LIBRARY_PATH=${ADDITIONAL_LD_LIBRARY_PATH}:${MAYA_LIB_PATH}"
NO_STANDALONE_INIT
)
15 changes: 15 additions & 0 deletions plugin/pxr/maya/lib/usdMaya/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ pxr_test_scripts(
# variable must be defined. Otherwise, mayapy unconditionally exits with 0
# (success), which completely masks test failures.

# In Maya 2024 mayapy was changed to an executable script file which adds
# the lib path the LD_LIBRARY_PATH. For Maya 2023 (and below) we need to
# mimic that here so that tests can find Maya libs. Normally this is
# handled by maya.standalone.initialize() but these tests are not run
# using the mayaUsd_add_test() which adds that.
if (IS_LINUX AND MAYA_APP_VERSION VERSION_LESS_EQUAL 2023)
get_filename_component(MAYAPY_EXE_PATH ${MAYA_PY_EXECUTABLE} DIRECTORY)
set(MAYA_LIB_PATH "${MAYAPY_EXE_PATH}/../lib")
endif()

set(TEST_INSTALL_PREFIX "${PXR_INSTALL_PREFIX}")
set(TEST_ENV
MAYA_PLUG_IN_PATH=${TEST_INSTALL_PREFIX}/maya/plugin
Expand All @@ -112,6 +122,11 @@ set(TEST_ENV
MAYA_NO_STANDALONE_ATEXIT=1
MAYA_APP_DIR=<PXR_TEST_DIR>/maya_profile
)
if (IS_LINUX AND MAYA_LIB_PATH)
list(APPEND TEST_ENV
LD_LIBRARY_PATH=${MAYA_LIB_PATH}
)
endif()

pxr_install_test_dir(
SRC testenv/UsdExportAssemblyTest
Expand Down