From 7ffd45512ce66cfb3315056d2b4b28e6c08969c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 15:08:34 -0300 Subject: [PATCH] RH8.1 fix. --- cmake/prepackage.cmake | 3 +++ mrv2/src/CMakeLists.txt | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake/prepackage.cmake b/cmake/prepackage.cmake index bc1dfe0c4..f2745338f 100644 --- a/cmake/prepackage.cmake +++ b/cmake/prepackage.cmake @@ -65,6 +65,9 @@ if( UNIX) set(linux_lib64_dir "${CPACK_PREPACKAGE}/lib64") if (EXISTS "${linux_lib64_dir}" ) message( NOTICE "${linux_lib64_dir} exists...") + file(GLOB lib64_dsos "${linux_lib64_dir}/*.so*") + file( COPY ${linux_lib64_dsos} + DESTINATION "${CPACK_PREPACKAGE}/lib/" ) else() message( NOTICE "${linux_lib64_dir} does not exist...") endif() diff --git a/mrv2/src/CMakeLists.txt b/mrv2/src/CMakeLists.txt index 92ea333c6..fca5d6dca 100644 --- a/mrv2/src/CMakeLists.txt +++ b/mrv2/src/CMakeLists.txt @@ -104,12 +104,18 @@ if ( APPLE ) DESTINATION lib COMPONENT applications ) elseif ( UNIX ) + # Install all .so in CMAKE_INSTALL_PREFIX/lib file( GLOB MRV_LIB_DSOS ${CMAKE_INSTALL_PREFIX}/lib/*.so* ) - file( GLOB MRV_LIB64_DSOS ${CMAKE_INSTALL_PREFIX}/lib64/*.so* ) - install( FILES ${MRV_LIB_DSOS} ${MRV_LIB64_DSOS} + install( FILES ${MRV_LIB_DSOS} DESTINATION lib COMPONENT applications ) + + # For RedHat and Rocky Linux, we must install also lib64 + file( GLOB MRV_LIB64_DSOS ${CMAKE_INSTALL_PREFIX}/lib64/*.so* ) + install( FILES ${MRV_LIB64_DSOS} + DESTINATION lib64 + COMPONENT applications ) elseif(WIN32) # # Handle python DLL and libs and TCL