From d2eb1c8396ea818a296707abb4b0400f8c5a4309 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 22 Aug 2023 12:37:21 +0200 Subject: [PATCH] build: add full SO versioning ABI gets repeatedly changed between tags, and so.MAJOR is no longer enough. Still don't know what to do about #3312 because that is a release where not even the minor number is changed. Fixes: #3052 #3311 --- SPIRV/CMakeLists.txt | 4 ++-- glslang/CMakeLists.txt | 4 ++-- hlsl/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index a80e74ed0..bdc860cb9 100644 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -75,7 +75,7 @@ set_target_properties(SPIRV PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}") + SOVERSION "${GLSLANG_VERSION}") target_include_directories(SPIRV PUBLIC $ $) @@ -88,7 +88,7 @@ if (ENABLE_SPVREMAPPER) FOLDER glslang POSITION_INDEPENDENT_CODE ON VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}") + SOVERSION "${GLSLANG_VERSION}") endif() if(WIN32 AND BUILD_SHARED_LIBS) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index d4df9396e..142c26c17 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt @@ -168,7 +168,7 @@ set_target_properties(glslang PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}") + SOVERSION "${GLSLANG_VERSION}") target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent) target_include_directories(glslang PUBLIC $ @@ -198,7 +198,7 @@ set(RESOURCELIMITS_HEADERS add_library(glslang-default-resource-limits STATIC ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS}) set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}" + SOVERSION "${GLSLANG_VERSION}" FOLDER glslang POSITION_INDEPENDENT_CODE ON) diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt index 058a67b08..105c73a63 100644 --- a/hlsl/CMakeLists.txt +++ b/hlsl/CMakeLists.txt @@ -42,7 +42,7 @@ set_target_properties(HLSL PROPERTIES FOLDER hlsl POSITION_INDEPENDENT_CODE ON VERSION "${GLSLANG_VERSION}" - SOVERSION "${GLSLANG_VERSION_MAJOR}") + SOVERSION "${GLSLANG_VERSION}") if(WIN32 AND BUILD_SHARED_LIBS) set_target_properties(HLSL PROPERTIES PREFIX "")