RH8.1 fix.

ggarra13 · Oct 7, 2023 · 7ffd455 · 7ffd455
1 parent 885d5b9
commit 7ffd455
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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