Commit 50bdb549 authored by Cedric CAFFY's avatar Cedric CAFFY
Browse files

Forgot to package the libctadiskunittests lib in the building of the RPM of CTA

parent b3eb2bd6
......@@ -246,7 +246,7 @@ The shared libraries
%{_libdir}/libctamessagesutils.so*
%{_libdir}/libctardbms.so*
%{_libdir}/libctardbmswrapper.so*
%{_libdir}/libdisk.so*
%{_libdir}/libctadisk.so*
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-catalogue.conf.example
#CTA-lib installs libraries so we need ldconfig.
......@@ -290,6 +290,7 @@ Unit tests and system tests with virtual tape drives
%{_libdir}/libctatapeserverscsiunittests.so*
%{_libdir}/libctadaemonunittests.so*
%{_libdir}/libctamediachangerunittests.so*
%{_libdir}/libctadiskunittests.so*
%{_bindir}/cta-systemTests
%{_libdir}/libctadaemonunittests-multiprocess.so*
%attr(0644,root,root) %{_datadir}/%{name}-%{ctaVersion}/unittest/*.suppr
......
......@@ -21,7 +21,7 @@ find_package (xrootdclient REQUIRED)
include_directories (${XROOTD_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
add_library(disk SHARED
add_library(ctadisk SHARED
DiskReporter.cpp
DiskReporterFactory.cpp
EOSReporter.cpp
......@@ -29,10 +29,10 @@ add_library(disk SHARED
RadosStriperPool.cpp
)
target_link_libraries (disk XrdCl cryptopp radosstriper)
target_link_libraries (ctadisk XrdCl cryptopp radosstriper)
set_property(TARGET disk PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET disk PROPERTY VERSION "${CTA_LIBVERSION}")
set_property(TARGET ctadisk PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET ctadisk PROPERTY VERSION "${CTA_LIBVERSION}")
add_library(ctadiskunittests SHARED
CryptoPPTest.cpp
......@@ -41,5 +41,5 @@ add_library(ctadiskunittests SHARED
set_property(TARGET ctadiskunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET ctadiskunittests PROPERTY VERSION "${CTA_LIBVERSION}")
install(TARGETS disk DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
install(TARGETS ctadisk DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
install(TARGETS ctadiskunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
\ No newline at end of file
......@@ -34,7 +34,7 @@ set_property(TARGET ctascheduler PROPERTY VERSION "${CTA_LIBVERSION}")
install (TARGETS ctascheduler DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
target_link_libraries (ctascheduler ctacommon ctaobjectstore ${PROTOBUF3_LIBRARIES} disk)
target_link_libraries (ctascheduler ctacommon ctaobjectstore ${PROTOBUF3_LIBRARIES} ctadisk)
#add_library (ctaschedulerutils SHARED
# _old_prototype_DummyScheduler.cpp)
......
......@@ -78,7 +78,7 @@ add_library(ctatapeserverfileunittests SHARED
)
target_link_libraries(ctatapeserverfileunittests
disk
ctadisk
)
set_property(TARGET ctatapeserverfileunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment