From d9e0c244064b22bafc52039b1706ad6faf0960cb Mon Sep 17 00:00:00 2001 From: rorgoroth <77244135+rorgoroth@users.noreply.github.com> Date: Sat, 21 Dec 2024 17:53:21 +0000 Subject: [PATCH] packages/spirv: tweak --- packages/spirv-cross-0001.patch | 10 +++++----- packages/spirv-cross.cmake | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/spirv-cross-0001.patch b/packages/spirv-cross-0001.patch index 3d37206a..1d3a1f8f 100644 --- a/packages/spirv-cross-0001.patch +++ b/packages/spirv-cross-0001.patch @@ -14,23 +14,23 @@ index 6860c5b..3ef7718 100644 @@ -345,7 +345,7 @@ if (SPIRV_CROSS_SHARED) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c-shared.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() - + - spirv_cross_add_library(spirv-cross-c-shared spirv_cross_c_shared SHARED + spirv_cross_add_library(spirv-cross-c-shared spirv_cross_c_shared STATIC ${spirv-cross-core-sources} ${spirv-cross-c-sources}) - + @@ -401,11 +401,6 @@ if (SPIRV_CROSS_SHARED) endif() endif() - + - target_compile_definitions(spirv-cross-c-shared PRIVATE SPVC_EXPORT_SYMBOLS) - - set_target_properties(spirv-cross-c-shared PROPERTIES - VERSION ${SPIRV_CROSS_VERSION} - SOVERSION ${spirv-cross-abi-major}) endif() - + if (SPIRV_CROSS_CLI) --- +-- 2.33.0 diff --git a/packages/spirv-cross.cmake b/packages/spirv-cross.cmake index b8760ae4..1a6108f1 100644 --- a/packages/spirv-cross.cmake +++ b/packages/spirv-cross.cmake @@ -9,6 +9,7 @@ ExternalProject_Add( CONFIGURE_COMMAND ${EXEC} cmake -H -B ${cmake_conf_args} + -DBUILD_SHARED_LIBS=OFF -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF