From a9eafeb5005a11e3b775829c6d03263cdefb94b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20R=C3=B6hling?= Date: Thu, 27 Jan 2022 19:50:26 +0100 Subject: [PATCH] Use system spirv-cross Gbp-Pq: Name 0012-Use-system-spirv-cross.patch --- CMakeLists.txt | 2 +- libs/filamat/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c117c3..632ece6 100644 --- 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 a130f0c..9b38857 100644 --- 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() # ================================================================================================== -- 2.30.2