[CMake/RPM] Package libxrdisal.so.

xrootd · Jan 25, 2021 · e7165e8 · e7165e8
1 parent 0d6d955
commit e7165e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
@@ -948,6 +948,7 @@ fi
 %{_libdir}/libXrdSsiShMap.so.2*
 %if %{?_with_isal:1}%{!?_with_isal:0}
 %{_libdir}/libXrdEc.so.1*
+%{_libdir}/libxrdisal.so.2*
 %endif
 %{_sysconfdir}/xrootd/client.plugins.d/client-plugin.conf.example
 %config(noreplace) %{_sysconfdir}/xrootd/client.conf
@@ -1006,6 +1007,7 @@ fi
 %{_libdir}/libXrdSsiShMap.so
 %if %{?_with_isal:1}%{!?_with_isal:0}
 %{_libdir}/libXrdEc.so
+%{_libdir}/libxrdisal.so
 %endif
 
 %files client

diff --git a/src/XrdEc/CMakeLists.txt b/src/XrdEc/CMakeLists.txt
@@ -59,9 +59,9 @@ ExternalProject_add(
 )
 
 set( ISAL_LIBS
-     ${ISAL_BUILDDIR}/.libs/libxrdisal.so
-     ${ISAL_BUILDDIR}/.libs/libxrdisal.so.2
-     ${ISAL_BUILDDIR}/.libs/libxrdisal.so.2.0.30
+     ${ISAL_LIBDIR}/libxrdisal.so
+     ${ISAL_LIBDIR}/libxrdisal.so.2
+     ${ISAL_LIBDIR}/libxrdisal.so.2.0.30
 )
 
 link_directories( ${ISAL_LIBDIR} )
@@ -111,6 +111,14 @@ install(
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
 
+#------------------------------------------------------------------------------
+# Install the ISAL library
+#------------------------------------------------------------------------------  
+install(
+  FILES
+  ${ISAL_LIBS}
+  DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+
 #------------------------------------------------------------------------------
 # Install private header files
 #------------------------------------------------------------------------------