Use system spirv-cross

Gbp-Pq: Name 0012-Use-system-spirv-cross.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c117c3e9cca33cb9e44864984dd4f2d5f4c902e..632ece6768253966a8b978754ff84aa9c0e6f6c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -624,7 +624,7 @@ add_subdirectory(${EXTERNAL}/getopt)
 if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
     include(debian/cmake/spirv-tools.cmake)
     include(debian/cmake/glslang.cmake)
-    add_subdirectory(${EXTERNAL}/spirv-cross/tnt)
+    include(debian/cmake/spirv-cross.cmake)
     add_subdirectory(${LIBRARIES}/filamat)
 
     # the material debugger requires filamat

diff --git a/libs/filamat/CMakeLists.txt b/libs/filamat/CMakeLists.txt
index a130f0c7bd561631a206ff0fd2bd8f8e2bed8448..9b38857bfeb061d76468e2da64ce60162ff48256 100644 (file)
--- a/libs/filamat/CMakeLists.txt
+++ b/libs/filamat/CMakeLists.txt
@@ -122,7 +122,7 @@ if (APPLE OR MSVC)
     target_link_libraries(${TARGET} glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross-glsl)
 else()
     target_link_libraries(${TARGET} PRIVATE
-            -Wl,--start-group glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross-glsl -Wl,--end-group)
+            -Wl,--start-group glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross -Wl,--end-group)
 endif()
 
 # ==================================================================================================