Merge pull request #1723 from AnimalLogic/csyshing/fix_compilation_is…

…sue_for_schema_and_header Fix compilation issue for schema, header and UFE linking
Autodesk · Sep 29, 2021 · 2efb12e · 2efb12e
2 parents 89ddd99 + 6b27610
commit 2efb12e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
@@ -16,6 +16,8 @@
 
 #include "meshViewportCompute.h"
 
+#ifdef HDVP2_ENABLE_GPU_COMPUTE
+
 #include "mesh.h"
 #include "render_delegate.h"
 
@@ -28,8 +30,6 @@
 
 #include <maya/MProfiler.h>
 
-#ifdef HDVP2_ENABLE_GPU_COMPUTE
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {

diff --git a/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt b/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt
@@ -105,6 +105,10 @@ endif()
 #------------------------------------------------------------------------------
 # install
 #------------------------------------------------------------------------------
+install(FILES api.h usdPreviewSurface.h usdPreviewSurfacePlugin.h
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${TARGET_NAME}
+)
+
 install(
     TARGETS ${TARGET_NAME}
     LIBRARY

diff --git a/lib/usd/schemas/CMakeLists.txt b/lib/usd/schemas/CMakeLists.txt
@@ -106,7 +106,7 @@ if(IS_WINDOWS)
     install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL)
 endif()
 
-install(FILES ${headers}
+install(FILES ${HEADERS}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${TARGET_NAME}
 )
 

diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt
@@ -17,9 +17,11 @@ pxr_shared_library(${PXR_PACKAGE}
         ${MAYA_OpenMayaRender_LIBRARY}
         ${MAYA_OpenMayaUI_LIBRARY}
         mayaUsd
+        $<$<BOOL:${UFE_FOUND}>:${UFE_LIBRARY}>
 
     INCLUDE_DIRS
         ${MAYA_INCLUDE_DIRS}
+        $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
 
     PUBLIC_HEADERS
         api.h
@@ -64,6 +66,10 @@ pxr_shared_library(${PXR_PACKAGE}
     DISABLE_PRECOMPILED_HEADERS
 )
 
+if (UFE_FOUND)
+    target_compile_definitions(${PXR_PACKAGE} PRIVATE WANT_UFE_BUILD)
+endif()
+
 pxr_test_scripts(
         testenv/testUsdExportAssembly.py
         testenv/testUsdExportAssemblyEdits.py