Merge pull request PixarAnimationStudios#169 from sirpalee/pr_katana_…

…cmake_fixes Fixing katana plugin linking issues.
hsh3826 · Feb 28, 2017 · 8d174dd · 8d174dd
2 parents 014dc84 + d048699
commit 8d174dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/third_party/katana/lib/katanaAttrfncApi/CMakeLists.txt b/third_party/katana/lib/katanaAttrfncApi/CMakeLists.txt
@@ -4,7 +4,7 @@ set(PXR_PACKAGE katanaAttrfncApi)
 file(GLOB cppFiles
     ${KATANA_API_SOURCE_DIR}/FnAttribute/client/*.cpp
     ${KATANA_API_SOURCE_DIR}/FnPluginManager/client/*.cpp
-    ${KATANA_API_SOURCE_DIR}/FnPluginSystem/client/*.cpp
+    ${KATANA_API_SOURCE_DIR}/FnPluginSystem/*.cpp
     ${KATANA_API_SOURCE_DIR}/FnAttributeFunction/plugin/*.cpp
 )
 

diff --git a/third_party/katana/lib/katanaOpApi/CMakeLists.txt b/third_party/katana/lib/katanaOpApi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB cppFiles
     ${KATANA_API_SOURCE_DIR}/FnGeolibServices/client/*.cpp
     ${KATANA_API_SOURCE_DIR}/FnLogging/client/*.cpp
     ${KATANA_API_SOURCE_DIR}/FnPluginManager/client/*.cpp
-    ${KATANA_API_SOURCE_DIR}/FnPluginSystem/client/*.cpp
+    ${KATANA_API_SOURCE_DIR}/FnPluginSystem/*.cpp
     ${KATANA_API_SOURCE_DIR}/pystring/.cpp
 )
 

diff --git a/third_party/katana/plugin/pxrUsdInShipped/CMakeLists.txt b/third_party/katana/plugin/pxrUsdInShipped/CMakeLists.txt
@@ -29,6 +29,7 @@ pxr_plugin(${PXR_PACKAGE}
         mesh.cpp
         model.cpp
         nurbsPatch.cpp
+        pointInstancer.cpp
         points.cpp
         scope.cpp
         uiUtils.cpp