Mathieu Malaterre pushed to branch master at Debian Med / ncbi-vdb
Commits: 25ca2396 by Mathieu Malaterre at 2022-02-24T09:13:08+01:00 d/patches: Start using cmake SONAME mechanism - - - - - 2 changed files: - debian/patches/series - + debian/patches/soversion.patch Changes: ===================================== debian/patches/series ===================================== @@ -14,3 +14,4 @@ redefine_CALL_MBEDTLS.patch zstd.patch fix_build.patch fix_cmake.patch +soversion.patch ===================================== debian/patches/soversion.patch ===================================== @@ -0,0 +1,43 @@ +Description: Use cmake mechanism for SONAME +Author: Mathieu Malaterre <[email protected]> +Last-Update: 2022-02-24 + +Index: ncbi-vdb/build/common.cmake +=================================================================== +--- ncbi-vdb.orig/build/common.cmake ++++ ncbi-vdb/build/common.cmake +@@ -113,20 +113,21 @@ function(MakeLinksShared target name ins + set( LIBSUFFIX ".${SHLX}.${VERSION}" ) + set( MAJLIBSUFFIX ".${SHLX}.${MAJVERS}" ) + endif() +- add_custom_command(TARGET ${target} +- POST_BUILD +- COMMAND rm -f lib${name}${LIBSUFFIX} +- COMMAND mv lib${name}.${SHLX} lib${name}${LIBSUFFIX} +- COMMAND ln -f -s lib${name}${LIBSUFFIX} lib${name}${MAJLIBSUFFIX} +- COMMAND ln -f -s lib${name}${MAJLIBSUFFIX} lib${name}.${SHLX} +- WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- ) ++ set_target_properties(${target} PROPERTIES VERSION ${VERSION} SOVERSION ${MAJVERS}) ++ #add_custom_command(TARGET ${target} ++ # POST_BUILD ++ # COMMAND rm -f lib${name}${LIBSUFFIX} ++ # COMMAND mv lib${name}.${SHLX} lib${name}${LIBSUFFIX} ++ # COMMAND ln -f -s lib${name}${LIBSUFFIX} lib${name}${MAJLIBSUFFIX} ++ # COMMAND ln -f -s lib${name}${MAJLIBSUFFIX} lib${name}.${SHLX} ++ # WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ++ #) + +- set_property( +- TARGET ${target} +- APPEND +- PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}${LIBSUFFIX};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}${MAJLIBSUFFIX};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}.${SHLX}" +- ) ++ #set_property( ++ # TARGET ${target} ++ # APPEND ++ # PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}${LIBSUFFIX};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}${MAJLIBSUFFIX};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}.${SHLX}" ++ #) + + if ( ${install} ) + install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${name}${LIBSUFFIX} View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/25ca2396895c15afe738b9209b1c350da18847ca -- View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/25ca2396895c15afe738b9209b1c350da18847ca You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
