Skip to content
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

Update mayaUsd_add_test macro calls in AL plugin to add support for additional schema paths #409

Merged
merged 6 commits into from
Apr 8, 2020
Merged

Update mayaUsd_add_test macro calls in AL plugin to add support for additional schema paths #409

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
756ee7d
got tests working with rez - but probably too much change
murphyeoin Apr 5, 2020
909dd0b
move to an approach where we inject any required paths via a cmake var
murphyeoin Apr 6, 2020
6a8ad36
removed usdtransaction from PXR_PLUGINPATH_NAME cmake change
murphyeoin Apr 6, 2020
2f12fbe
reset version header
murphyeoin Apr 6, 2020
b278c97
update to match other mayaUsd_add_test macros
murphyeoin Apr 6, 2020
3445524
removed explicit OpenMayaFX addition
murphyeoin Apr 8, 2020
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
1 change: 1 addition & 0 deletions lib/usd/translators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ target_link_libraries(${TARGET_NAME}
usdUtils
vt
${MAYA_LIBRARIES}
OpenMayaFX
Copy link
Contributor Author

@murphyeoin murphyeoin Apr 7, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know @robthebloke has added this before and it's been rejected (I can't find that PR at the moment) but it's definitely needed as a dependency at least in maya-2019, when running our tests using AL's test/build infrastructure

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what it's worth, we definitely needed this when usdMaya was in the USD repo (v19.11):
https://github.com/PixarAnimationStudios/USD/blob/4b1162957b2ad219e1635c81de8343be490e41fc/third_party/maya/plugin/pxrUsdTranslators/CMakeLists.txt#L24

This was because the translator for Maya stroke nodes used an OpenMayaFX header:
https://github.com/PixarAnimationStudios/USD/blob/4b1162957b2ad219e1635c81de8343be490e41fc/third_party/maya/plugin/pxrUsdTranslators/strokeWriter.cpp#L44

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mattyjams ... The link error we're seeing is related to MFnParticleSystem in particleWriter.cpp

mayaUsd
mayaUsd_Schemas
)
Expand Down
3 changes: 2 additions & 1 deletion plugin/al/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,5 @@ mayaUsd_add_test(${TARGET_NAME}
PYTHON_COMMAND "${pycode}"
ENV
"MAYA_PLUG_IN_PATH=${MAYAUTILS_TEST_MAYAPLUGIN_INSTALL_PATH}"
)
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)
2 changes: 2 additions & 0 deletions plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ sys.exit(maya.cmds.AL_maya_test_UnitTestHarness())

mayaUsd_add_test(${TARGET_NAME}
PYTHON_COMMAND "${pycode}"
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)

if(NOT SKIP_USDMAYA_TESTS)
Expand Down
8 changes: 8 additions & 0 deletions plugin/al/plugin/AL_USDMayaTestPlugin/py/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
mayaUsd_add_test(TestALUSDMayaPython_ProxyShape
PYTHON_MODULE testProxyShape
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)

mayaUsd_add_test(TestALUSDMayaPython_Translators
PYTHON_MODULE testTranslators
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)

mayaUsd_add_test(TestALUSDMayaPython_LayerManager
PYTHON_MODULE testLayerManager
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)

mayaUsd_add_test(TestALUSDMayaPython_ImportModule
PYTHON_MODULE testUSDMayaPythonModuleOnly
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
NO_STANDALONE_INIT
)
2 changes: 2 additions & 0 deletions plugin/al/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@ endif()

mayaUsd_add_test(${TARGET_NAME}
COMMAND $<TARGET_FILE:${TARGET_NAME}>
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)
1 change: 1 addition & 0 deletions plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ mayaUsd_add_test(${TEST_NAME}
ENV
"PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}"
"TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)
2 changes: 2 additions & 0 deletions plugin/al/translators/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
mayaUsd_add_test(TestAdditionalTranslators
PYTHON_MODULE testTranslators
ENV
"PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
)