From: Jan Engelhardt Date: 2022-10-25 02:00:05.861368368 +0200 References: https://github.com/KhronosGroup/glslang/issues/3052 The ABI break in commit 11.12.0~18^2 causes programs to no longer run. Induce a SONAME change. --- SPIRV/CMakeLists.txt | 4 ++-- StandAlone/CMakeLists.txt | 2 +- glslang/CMakeLists.txt | 2 +- hlsl/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Index: glslang-11.12.0/SPIRV/CMakeLists.txt =================================================================== --- glslang-11.12.0.orig/SPIRV/CMakeLists.txt +++ glslang-11.12.0/SPIRV/CMakeLists.txt @@ -70,7 +70,7 @@ set(SPVREMAP_HEADERS doc.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") +set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC @@ -81,7 +81,7 @@ glslang_add_build_info_dependency(SPIRV) if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") + set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() Index: glslang-11.12.0/StandAlone/CMakeLists.txt =================================================================== --- glslang-11.12.0.orig/StandAlone/CMakeLists.txt +++ glslang-11.12.0/StandAlone/CMakeLists.txt @@ -50,7 +50,7 @@ add_custom_command( add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) -set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") +set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) Index: glslang-11.12.0/glslang/CMakeLists.txt =================================================================== --- glslang-11.12.0.orig/glslang/CMakeLists.txt +++ glslang-11.12.0/glslang/CMakeLists.txt @@ -169,7 +169,7 @@ set_target_properties(glslang PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}") + SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent) target_include_directories(glslang PUBLIC $ Index: glslang-11.12.0/hlsl/CMakeLists.txt =================================================================== --- glslang-11.12.0.orig/hlsl/CMakeLists.txt +++ glslang-11.12.0/hlsl/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(HLSL ${LIB_TYPE} "stub.cpp") set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) -set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") +set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") if(WIN32 AND BUILD_SHARED_LIBS) set_target_properties(HLSL PROPERTIES PREFIX "")