Layer Editor Unification

lib/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(usdUfe)
+add_subdirectory(usdLayerEditor)
 if (BUILD_MAYAUSD_LIBRARY)
     add_subdirectory(mayaUsd)
     add_subdirectory(usd)

lib/mayaUsd/CMakeLists.txt

@@ -272,11 +272,18 @@ target_link_libraries(${PROJECT_NAME}
         $<$<BOOL:${CMAKE_WANT_MATERIALX_BUILD}>:MaterialXGenGlsl>
 )
 
+target_link_libraries(${PROJECT_NAME} PRIVATE usdLayerEditor Qt::Core)
+target_compile_definitions(${PROJECT_NAME} PRIVATE MAYAUSD_USE_SHARED_LAYER_EDITOR=1)
+
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------
 if(IS_MACOSX OR IS_LINUX)
     mayaUsd_init_rpath(rpath "lib")
+    # Search libmayaUsd's own directory so it can resolve sibling libraries it
+    # links privately (e.g. usdLayerEditor). DT_RUNPATH is non-transitive, so
+    # such siblings are not found via the loading module's rpath.
+    mayaUsd_add_rpath(rpath ".")
     if(DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
         mayaUsd_add_rpath(rpath "../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib")
     elseif(DEFINED PXR_USD_LOCATION)

lib/mayaUsd/commands/CMakeLists.txt

@@ -10,6 +10,7 @@ target_sources(${PROJECT_NAME}
         editTargetCommand.cpp
         layerEditorCommand.cpp
         layerEditorWindowCommand.cpp
+        mayaLayerEditorDCCFunctions.cpp
         schemaCommand.cpp
 )
 
@@ -22,6 +23,7 @@ set(HEADERS
         editTargetCommand.h
         layerEditorCommand.h
         layerEditorWindowCommand.h
+        mayaLayerEditorDCCFunctions.h
         schemaCommand.h
 )