646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
|
index acfa0c12..bf3eb686 100644
|
|
--- a/source/CMakeLists.txt
|
|
+++ b/source/CMakeLists.txt
|
|
@@ -378,16 +378,6 @@ function(spirv_tools_default_target_options target)
|
|
add_dependencies(${target} spirv-tools-build-version core_tables enum_string_mapping extinst_tables)
|
|
endfunction()
|
|
|
|
-# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
|
|
-# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility.
|
|
-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
|
|
-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
|
|
-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
|
|
-target_compile_definitions(${SPIRV_TOOLS}-shared
|
|
- PRIVATE SPIRV_TOOLS_IMPLEMENTATION
|
|
- PUBLIC SPIRV_TOOLS_SHAREDLIB
|
|
-)
|
|
-
|
|
if(SPIRV_TOOLS_BUILD_STATIC)
|
|
add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
|
|
spirv_tools_default_target_options(${SPIRV_TOOLS}-static)
|
|
@@ -402,7 +392,7 @@ if(SPIRV_TOOLS_BUILD_STATIC)
|
|
add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
|
|
endif()
|
|
|
|
- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
|
|
+ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static)
|
|
else()
|
|
add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
|
|
spirv_tools_default_target_options(${SPIRV_TOOLS})
|