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

Minor cmake clean up pxr plugin #653

Merged
merged 5 commits into from
Jul 16, 2020
Merged

Minor cmake clean up pxr plugin #653

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f770818
${Boost_PYTHON_LIBRARY} and ${Boost_INCLUDE_DIRS} are empty.
Jul 12, 2020
b4c3ae3
Remove linking against redundant libraries. Linking against mayaUsd b…
Jul 12, 2020
7d62065
Linking against usdMaya automatically brings in mayaUsd
Jul 12, 2020
114c4ec
Revert "Linking against usdMaya automatically brings in mayaUsd"
Jul 15, 2020
f70e798
Address feedback. remove libraries that are no longer used.
Jul 16, 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
22 changes: 0 additions & 22 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 @@ -2,31 +2,9 @@ set(PXR_PACKAGE usdMaya)

pxr_shared_library(${PXR_PACKAGE}
LIBRARIES
ar
gf
js
kind
plug
sdf
tf
usd
usdGeom
usdLux
usdRi
usdShade
usdSkel
usdUtils
vt
${Boost_PYTHON_LIBRARY}
${MAYA_Foundation_LIBRARY}
${MAYA_OpenMaya_LIBRARY}
${MAYA_OpenMayaAnim_LIBRARY}
${MAYA_OpenMayaRender_LIBRARY}
${MAYA_OpenMayaUI_LIBRARY}
mayaUsd

INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

these variables are empty?? The mystery part is how usdMaya links against Boost?

${MAYA_INCLUDE_DIRS}

PUBLIC_HEADERS
Expand Down
8 changes: 0 additions & 8 deletions plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ pxr_plugin(${PXR_PACKAGE}
MAYA_PLUGIN

LIBRARIES
mayaUsd
sdf
tf
usd
usdGeom
usdMaya
${MAYA_Foundation_LIBRARY}
${MAYA_OpenMaya_LIBRARY}
${MAYA_OpenMayaRender_LIBRARY}

INCLUDE_DIRS
${MAYA_INCLUDE_DIRS}
Expand Down