Merge pull request #4105 from opensim-org/opensim_452

Merge Opensim 4.5.2 fix to rpath issues for moco dependencies

Author: nickbianco

CHANGELOG.md

@@ -16,7 +16,6 @@ v4.6
 - Fixed bug in `C3DFileAdapter` where there was an error when reading C3D files with more than 255 markers. It now excludes non-marker points (POINT:ANGLES, POINT:POWERS, POINT:FORCES, POINT:MOMENTS, and POINT:SCALARS). (#3606)
 - updated `ezc3d` version to `1.5.19`.
 
-
 v4.5.2
 ======
 - The performance of `getStateVariableValue`, `getStateVariableDerivativeValue`, and `getModelingOption` was improved in

CMakeLists.txt

@@ -859,7 +859,7 @@ if (OPENSIM_WITH_CASADI)
                 ${libgcc_name}
                 DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-        elseif(OPENSIM_COPY_DEPENDENCIES AND LINUX)
+        elseif(OPENSIM_COPY_DEPENDENCIES)
             get_filename_component(gcc_libdir "${pkgcfg_lib_IPOPT_gfortran}" DIRECTORY)
 
             file(GLOB gfortran "${gcc_libdir}/../../../x86_64-linux-gnu/libgfortran*.so*")

cmake/OpenSimMocoInstallLinuxDependencyLibraries.cmake.in

@@ -4,7 +4,6 @@
 # for ease of comparison maintenance. Same with commented lines
 
 set(libdir "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
-message(STATUS "Editing RPATH of CasADi dependency libraries")
 
 macro(install_name_tool_add_rpath lib)
     execute_process(COMMAND bash "-c" "patchelf --force-rpath --set-rpath '$ORIGIN/:$ORIGIN/../../sdk/Simbody/lib' '${libdir}/lib${lib}'"
@@ -36,10 +35,10 @@ if (OPENSIM_WITH_CASADI)
     install_name_tool_add_rpath(coinmumps.so.3)
     install_name_tool_print_rpath(coinmumps.so.3)
 
-    install_name_tool_print_rpath(coinmetis.so.1)
-    install_name_tool_delete_rpath(coinmetis.so.1)
-    install_name_tool_add_rpath(coinmetis.so.1)
-    install_name_tool_print_rpath(coinmetis.so.1)
+    install_name_tool_print_rpath(metis.so)
+    install_name_tool_delete_rpath(metis.so)
+    install_name_tool_add_rpath(metis.so)
+    install_name_tool_print_rpath(metis.so)
 
     install_name_tool_print_rpath(casadi_conic_nlpsol.so)
     install_name_tool_delete_rpath(casadi_conic_nlpsol.so)

cmake/OpenSimMocoInstallMacDependencyLibraries.cmake.in

@@ -57,13 +57,19 @@ endmacro()
 if (OPENSIM_WITH_CASADI)
     install_name_tool_add_rpath(casadi.3.7)
     install_name_tool_delete_rpath(casadi.3.7 "@CASADI_LIBDIR@")
+    install_name_tool_delete_rpath(casadi_nlpsol_ipopt.3.7 "@CASADI_LIBDIR@")
+
+    install_name_tool_add_rpath(ipopt.3)
+    install_name_tool_add_rpath(coinmumps.3)
+    install_name_tool_change(ipopt.3 coinmumps.3 "@IPOPT_LIBDIR@")
 
     install_name_tool_change(casadi_nlpsol_ipopt.3.7 ipopt.3 "@IPOPT_LIBDIR@")
     install_name_tool_change(casadi_nlpsol_ipopt.3.7 coinmumps.3 "@IPOPT_LIBDIR@")
     install_name_tool_change(casadi_nlpsol_ipopt.3.7 metis "@IPOPT_LIBDIR@")
+    install_name_tool_change_gfortran(casadi_nlpsol_ipopt.3.7)
     install_name_tool_change_quadmath(casadi_nlpsol_ipopt.3.7)
     install_name_tool_add_rpath(casadi_nlpsol_ipopt.3.7)
-    install_name_tool_delete_rpath(casadi_nlpsol_ipopt.3.7 "@CASADI_LIBDIR@")
+
 endif()