From f770818525bfaa9430d7354ce874ff0b70f89648 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sun, 12 Jul 2020 13:29:24 -0400 Subject: [PATCH 1/5] ${Boost_PYTHON_LIBRARY} and ${Boost_INCLUDE_DIRS} are empty. --- plugin/pxr/maya/lib/usdMaya/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt index f71d22af0d..57a0b79037 100644 --- a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt +++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt @@ -17,7 +17,6 @@ pxr_shared_library(${PXR_PACKAGE} usdSkel usdUtils vt - ${Boost_PYTHON_LIBRARY} ${MAYA_Foundation_LIBRARY} ${MAYA_OpenMaya_LIBRARY} ${MAYA_OpenMayaAnim_LIBRARY} @@ -26,7 +25,6 @@ pxr_shared_library(${PXR_PACKAGE} mayaUsd INCLUDE_DIRS - ${Boost_INCLUDE_DIRS} ${MAYA_INCLUDE_DIRS} PUBLIC_HEADERS From b4c3ae30838ad5640c5b32b49e6bccd50cfb8630 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sun, 12 Jul 2020 13:32:17 -0400 Subject: [PATCH 2/5] Remove linking against redundant libraries. Linking against mayaUsd brings in the dependencies for usd and maya libraries. --- plugin/pxr/maya/lib/usdMaya/CMakeLists.txt | 20 -------------------- plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt | 7 ------- 2 files changed, 27 deletions(-) diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt index 57a0b79037..7bce77ed18 100644 --- a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt +++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt @@ -2,26 +2,6 @@ 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 - ${MAYA_Foundation_LIBRARY} - ${MAYA_OpenMaya_LIBRARY} - ${MAYA_OpenMayaAnim_LIBRARY} - ${MAYA_OpenMayaRender_LIBRARY} - ${MAYA_OpenMayaUI_LIBRARY} mayaUsd INCLUDE_DIRS diff --git a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt index e9f2f08d66..31bce53e30 100644 --- a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt @@ -5,14 +5,7 @@ pxr_plugin(${PXR_PACKAGE} LIBRARIES mayaUsd - sdf - tf - usd - usdGeom usdMaya - ${MAYA_Foundation_LIBRARY} - ${MAYA_OpenMaya_LIBRARY} - ${MAYA_OpenMayaRender_LIBRARY} INCLUDE_DIRS ${MAYA_INCLUDE_DIRS} From 7d6206554947063873c61f6f1ddc78a572cfe451 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sun, 12 Jul 2020 13:50:57 -0400 Subject: [PATCH 3/5] Linking against usdMaya automatically brings in mayaUsd --- plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt index 31bce53e30..5787ed6ebd 100644 --- a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt @@ -4,7 +4,6 @@ pxr_plugin(${PXR_PACKAGE} MAYA_PLUGIN LIBRARIES - mayaUsd usdMaya INCLUDE_DIRS From 114c4ec0439033e7a9de3be541e73b9e727b5251 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Wed, 15 Jul 2020 15:56:24 -0400 Subject: [PATCH 4/5] Revert "Linking against usdMaya automatically brings in mayaUsd" --- plugin/pxr/maya/lib/usdMaya/CMakeLists.txt | 19 +++++++++++++++++++ plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt | 8 ++++++++ 2 files changed, 27 insertions(+) diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt index 7bce77ed18..862ecd4f66 100644 --- a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt +++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt @@ -2,6 +2,25 @@ set(PXR_PACKAGE usdMaya) pxr_shared_library(${PXR_PACKAGE} LIBRARIES + ar + gf + js + kind + sdf + tf + usd + usdGeom + usdLux + usdRi + usdShade + usdSkel + usdUtils + vt + ${MAYA_Foundation_LIBRARY} + ${MAYA_OpenMaya_LIBRARY} + ${MAYA_OpenMayaAnim_LIBRARY} + ${MAYA_OpenMayaRender_LIBRARY} + ${MAYA_OpenMayaUI_LIBRARY} mayaUsd INCLUDE_DIRS diff --git a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt index 5787ed6ebd..e9f2f08d66 100644 --- a/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt @@ -4,7 +4,15 @@ 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} From f70e798850e98e562be556e0fdfdaeb52df3b188 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Thu, 16 Jul 2020 08:37:54 -0400 Subject: [PATCH 5/5] Address feedback. remove libraries that are no longer used. --- plugin/pxr/maya/lib/usdMaya/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt index 862ecd4f66..353c291685 100644 --- a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt +++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt @@ -4,16 +4,11 @@ pxr_shared_library(${PXR_PACKAGE} LIBRARIES ar gf - js kind sdf tf usd usdGeom - usdLux - usdRi - usdShade - usdSkel usdUtils vt ${MAYA_Foundation_LIBRARY}