Attempt in fixing Linux and OSX shaders library not found

Autodesk · Jul 8, 2024 · 5e98dbc · 5e98dbc
1 parent aca3725
commit 5e98dbc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/lib/flowViewport/usdPlugins/shadersDiscoveryPlugin/CMakeLists.txt b/lib/flowViewport/usdPlugins/shadersDiscoveryPlugin/CMakeLists.txt
@@ -57,10 +57,16 @@ set(PLUG_INFO_PATH "plugInfo.json")
 
 configure_file(${PLUG_INFO_PATH} ${CMAKE_CURRENT_BINARY_DIR}/${PLUG_INFO_PATH})
 
-install(FILES ${PLUG_INFO_PATH}
+if(IS_WINDOWS)
+install(FILES Windows/${PLUG_INFO_PATH}
         DESTINATION 
-            ${CMAKE_INSTALL_PREFIX}/lib/usd/flowViewportShadersDiscoveryPlugin/resources
-)
+            ${CMAKE_INSTALL_PREFIX}/lib/usd/flowViewportShadersDiscoveryPlugin/resources)
+endif()
+if(IS_MACOSX OR IS_LINUX) 
+install(FILES Linux-OSX/${PLUG_INFO_PATH}
+        DESTINATION 
+            ${CMAKE_INSTALL_PREFIX}/lib/usd/flowViewportShadersDiscoveryPlugin/resources)    
+endif()
 
 install(TARGETS ${TARGET_NAME}
         LIBRARY

diff --git a/lib/flowViewport/usdPlugins/shadersDiscoveryPlugin/Linux-OSX/plugInfo.json b/lib/flowViewport/usdPlugins/shadersDiscoveryPlugin/Linux-OSX/plugInfo.json
@@ -0,0 +1,20 @@
+{
+    "Plugins":[
+      {
+        "Info": {
+          "Types": {
+            "FlowViewportShadersDiscoveryPlugin": {
+              "bases": [ "NdrDiscoveryPlugin" ],
+              "displayName": "Flow viewport custom shaders discovery plugin."
+            }
+          },
+          "ShaderResources": "shaders"
+        },
+		"LibraryPath": "flowViewportShadersDiscoveryPlugin.so",
+        "Name": "flowViewportShadersDiscoveryPlugin",
+        "ResourcePath": "shaders",
+        "Root": "..",
+        "Type": "library"
+      }
+    ]
+}
diff --git a/...gins/shadersDiscoveryPlugin/plugInfo.json → ...dersDiscoveryPlugin/Windows/plugInfo.json b/...gins/shadersDiscoveryPlugin/plugInfo.json → ...dersDiscoveryPlugin/Windows/plugInfo.json