From 5ce3add484adb2fe1b6d9bcd5821645fcc3c9b27 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 14 Jun 2024 15:11:22 -0500 Subject: [PATCH 1/2] Fix symlink install versioned shared library This is a catkin port of the same change to ament_cmake. Co-authored-by: JafarAbdi --- cmake/symlink_install/catkin_symlink_install.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/symlink_install/catkin_symlink_install.cmake.in b/cmake/symlink_install/catkin_symlink_install.cmake.in index 3fd908f9d..81fc51b5e 100644 --- a/cmake/symlink_install/catkin_symlink_install.cmake.in +++ b/cmake/symlink_install/catkin_symlink_install.cmake.in @@ -239,7 +239,7 @@ function(catkin_symlink_install_targets) get_filename_component(fileext "${file}" EXT) if(fileext STREQUAL ".a" OR fileext STREQUAL ".lib") set(destination "${ARG_ARCHIVE_DESTINATION}") - elseif(fileext STREQUAL ".dylib" OR fileext STREQUAL ".so") + elseif(fileext STREQUAL ".dylib" OR fileext MATCHES "\.so(\.[0-9]+)?(\.[0-9]+)?(\.[0-9]+)?$") set(destination "${ARG_LIBRARY_DESTINATION}") elseif(fileext STREQUAL "" OR fileext STREQUAL ".dll" OR fileext STREQUAL ".exe") set(destination "${ARG_RUNTIME_DESTINATION}") From abc41657c09e30894be9aa52289f858bd0f9b675 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 14 Jun 2024 15:22:38 -0500 Subject: [PATCH 2/2] fixup! Fix symlink install versioned shared library --- cmake/symlink_install/catkin_symlink_install.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/symlink_install/catkin_symlink_install.cmake.in b/cmake/symlink_install/catkin_symlink_install.cmake.in index 81fc51b5e..34fe51ecd 100644 --- a/cmake/symlink_install/catkin_symlink_install.cmake.in +++ b/cmake/symlink_install/catkin_symlink_install.cmake.in @@ -239,7 +239,7 @@ function(catkin_symlink_install_targets) get_filename_component(fileext "${file}" EXT) if(fileext STREQUAL ".a" OR fileext STREQUAL ".lib") set(destination "${ARG_ARCHIVE_DESTINATION}") - elseif(fileext STREQUAL ".dylib" OR fileext MATCHES "\.so(\.[0-9]+)?(\.[0-9]+)?(\.[0-9]+)?$") + elseif(fileext STREQUAL ".dylib" OR fileext MATCHES "\\.so(\\.[0-9]+)?(\\.[0-9]+)?(\\.[0-9]+)?$") set(destination "${ARG_LIBRARY_DESTINATION}") elseif(fileext STREQUAL "" OR fileext STREQUAL ".dll" OR fileext STREQUAL ".exe") set(destination "${ARG_RUNTIME_DESTINATION}")