From cc36ccd07d1de7138d7284ae65095d1b2f619f5c Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Fri, 4 Oct 2024 19:48:44 -0700 Subject: [PATCH] cmake: Use fixed SOVERSION everywhere We missed a spot when freezing the SOVERSION to 30 after we flipped to 31 causing builds to break. --- cmake/linux/helpers.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/linux/helpers.cmake b/cmake/linux/helpers.cmake index b954fb4a76a2b3..260062e4cfb2dd 100644 --- a/cmake/linux/helpers.cmake +++ b/cmake/linux/helpers.cmake @@ -19,6 +19,7 @@ function(set_target_properties_obs target) endwhile() get_target_property(target_type ${target} TYPE) + set(OBS_SOVERSION 30) if(target_type STREQUAL EXECUTABLE) install(TARGETS ${target} RUNTIME DESTINATION "${OBS_EXECUTABLE_DESTINATION}" COMPONENT Runtime) @@ -59,8 +60,8 @@ function(set_target_properties_obs target) set_target_properties( ${target} PROPERTIES - VERSION 30 - SOVERSION 30 + VERSION ${OBS_SOVERSION} + SOVERSION ${OBS_SOVERSION} BUILD_RPATH "${OBS_OUTPUT_DIR}/$/${OBS_LIBRARY_DESTINATION}" INSTALL_RPATH "${OBS_LIBRARY_RPATH}" ) @@ -96,7 +97,7 @@ function(set_target_properties_obs target) POST_BUILD COMMAND "${CMAKE_COMMAND}" -E create_symlink - "$$.so.${OBS_VERSION_MAJOR}" + "$$.so.${OBS_SOVERSION}" "$$.so.0" COMMAND "${CMAKE_COMMAND}" -E copy_if_different @@ -107,13 +108,13 @@ function(set_target_properties_obs target) endif() elseif(target_type STREQUAL MODULE_LIBRARY) if(target STREQUAL obs-browser) - set_target_properties(${target} PROPERTIES VERSION 0 SOVERSION 30) + set_target_properties(${target} PROPERTIES VERSION 0 SOVERSION ${OBS_SOVERSION}) else() set_target_properties( ${target} PROPERTIES VERSION 0 - SOVERSION 30 + SOVERSION ${OBS_SOVERSION} BUILD_RPATH "${OBS_OUTPUT_DIR}/$/${OBS_LIBRARY_DESTINATION}" INSTALL_RPATH "${OBS_MODULE_RPATH}" )