Renamed cta libraries to ctaxxx from castorxxx to avoid collisions with installed castor libraries.

cmdline/CMakeLists.txt

@@ -9,8 +9,8 @@ target_link_libraries (cta ${XROOTD_XRDCL_LIB} ctacommon cryptopp)
 
 include_directories (${CMAKE_SOURCE_DIR}/tapeserver/)
 add_executable (ctaAddAdminUser CTAAddAdminUser.cpp )
-target_link_libraries (ctaAddAdminUser castorcommon castorserver castorlog 
-  ctacommon castorutils protobuf ctascheduler ctanameserver)
+target_link_libraries (ctaAddAdminUser ctacommon castorserver ctalog 
+  castorcommon ctautils protobuf ctascheduler ctanameserver)
 
 install (TARGETS cta ctaAddAdminUser DESTINATION usr/bin)
 

nameserver/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library (ctanameserver SHARED
   NameServer.cpp
   NameServerTapeFile.cpp)
 
-target_link_libraries(ctanameserver castorns castorcommon)
+target_link_libraries(ctanameserver castorns ctacommon)
 
 install (TARGETS ctanameserver DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
 

tapeserver/castor/exception/CMakeLists.txt

@@ -2,5 +2,5 @@ cmake_minimum_required (VERSION 2.6)
 
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
 
-add_library (castorexceptionunittests SHARED
+add_library (ctaexceptionunittests SHARED
   ExceptionTest.cpp)

tapeserver/castor/io/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.6)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver/h)
 
-add_library (castoriounittests SHARED
+add_library (ctaiounittests SHARED
   IoTest.cpp)
-target_link_libraries (castoriounittests
+target_link_libraries (ctaiounittests
   castorclient)

tapeserver/castor/legacymsg/CMakeLists.txt

@@ -3,11 +3,11 @@ cmake_minimum_required (VERSION 2.6)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver/h)
 
-add_library (castorlegacymsgunittests SHARED
+add_library (ctalegacymsgunittests SHARED
   CommonMarshalTest.cpp
   GenericMarshalTest.cpp
   TapeMarshalTest.cpp)
-target_link_libraries (castorlegacymsgunittests
+target_link_libraries (ctalegacymsgunittests
   castorclient
   castorlegacymsg
-  castormessages)
+  ctamessages)

tapeserver/castor/log/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.6)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver/h)
 
-add_library (castorlogutils SHARED
+add_library (ctalogutils SHARED
   DummyLogger.cpp)
 
 set (LOG_LIB_SRC_FILES
@@ -14,9 +14,9 @@ set (LOG_LIB_SRC_FILES
   LogContext.cpp
   Message.cpp
   Param.cpp)
-add_library (castorlog ${LOG_LIB_SRC_FILES})
+add_library (ctalog ${LOG_LIB_SRC_FILES})
 
-add_library (castorlogunittests SHARED
+add_library (ctalogunittests SHARED
   ParamTest.cpp
   LogContextTest.cpp
   StringLoggerTest.cpp

tapeserver/castor/mediachanger/CMakeLists.txt

@@ -32,7 +32,7 @@ set (MEDIA_CHANGER_LIB_SRC_FILES
   MmcProxyNotSupported.cpp
   ScsiLibrarySlot.cpp
   TapeLibraryType.cpp)
-add_library(castormediachanger ${MEDIA_CHANGER_LIB_SRC_FILES})
+add_library(ctamediachanger ${MEDIA_CHANGER_LIB_SRC_FILES})
 
-add_library(castormediachangerutils SHARED
+add_library(ctamediachangerutils SHARED
   MmcProxyDummy.cpp)

tapeserver/castor/messages/CMakeLists.txt

@@ -28,14 +28,14 @@ find_package(Protobuf)
 file(GLOB ProtoFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.proto")
 PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
 
-add_library(castormessagesprotobuf
+add_library(ctamessagesprotobuf
   ${ProtoSources})
 
-add_library(castormessagesutils SHARED
+add_library(ctamessagesutils SHARED
   AcsProxyDummy.cpp
   TapeserverProxyDummy.cpp)
 
-set(CastorMessageSrcs
+set(CtaMessageSrcs
   AcsProxy.cpp
   AcsProxyZmq.cpp
   Constants.cpp
@@ -51,21 +51,21 @@ set(CastorMessageSrcs
   ZmqSocketST.cpp
 )
 
-add_library(castormessages SHARED
-  ${CastorMessageSrcs})
+add_library(ctamessages SHARED
+  ${CtaMessageSrcs})
 
-add_dependencies(castormessages castormessagesprotobuf)
+add_dependencies(ctamessages ctamessagesprotobuf)
 
-target_link_libraries(castormessages
-  castormessagesprotobuf
-  castorlog
-  castormediachanger
-  castorutils
+target_link_libraries(ctamessages
+  ctamessagesprotobuf
+  ctalog
+  ctamediachanger
+  ctautils
   protobuf
   ssl
   zmq)
 
-add_library(castormessagesunittests SHARED
+add_library(ctamessagesunittests SHARED
   MessagesTest.cpp
   MutexLockerTest.cpp
   MutexTest.cpp)

tapeserver/castor/server/CMakeLists.txt

@@ -3,10 +3,10 @@ cmake_minimum_required (VERSION 2.6)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
 include_directories(${PROJECT_SOURCE_DIR}/tapeserver/h)
 
-add_library (castorserverutils SHARED
+add_library (ctaserverutils SHARED
   ProcessCapDummy.cpp)
 
-add_library (castorserverunittests SHARED
+add_library (ctaserverunittests SHARED
   AtomicCounterTest.cpp
   DaemonTest.cpp
   SmartCapTest.cpp
@@ -15,5 +15,5 @@ add_library (castorserverunittests SHARED
   ThreadingMTTests.cpp
   ThreadingTests.cpp)
 
-target_link_libraries (castorserverunittests
+target_link_libraries (ctaserverunittests
   castorserver)

tapeserver/castor/tape/reactor/CMakeLists.txt

@@ -30,18 +30,18 @@ set (REACTOR_SRC_FILES
   PollReactorImpl.cpp
   ZMQPollEventHandler.cpp
   ZMQReactor.cpp)
-add_library (castortapereactor ${REACTOR_SRC_FILES})
-target_link_libraries (castortapereactor)
+add_library (ctatapereactor ${REACTOR_SRC_FILES})
+target_link_libraries (ctatapereactor)
 
-add_library (castortapereactorutils SHARED
+add_library (ctatapereactorutils SHARED
   DummyPollEventHandler.cpp
   DummyPollReactor.cpp
   DummyZMQReactor.cpp)
 
-add_library (castortapereactorunittests SHARED
+add_library (ctatapereactorunittests SHARED
   PollReactorImplTest.cpp
   ZMQReactorTest.cpp)
 
-target_link_libraries (castortapereactorunittests
-  castortapereactor
-  castortapereactorutils)
+target_link_libraries (ctatapereactorunittests
+  ctatapereactor
+  ctatapereactorutils)

tapeserver/castor/tape/tapeserver/SCSI/CMakeLists.txt

@@ -23,6 +23,6 @@ include_directories(${CMAKE_SOURCE_DIR}/tapeserver)
 
 add_library(SCSI Device.cpp Structures.cpp Constants.cpp Exception.cpp)
 
-add_library(castortapeserverscsiunittests SHARED
+add_library(ctatapeserverscsiunittests SHARED
   DeviceTest.cpp
   StructuresTest.cpp)

tapeserver/castor/tape/tapeserver/daemon/CMakeLists.txt

@@ -28,7 +28,7 @@ include_directories(${PROJECT_BINARY_DIR})
 
 find_package( ZLIB REQUIRED )
 
-add_library(castorTapeServerDaemon
+add_library(ctaTapeServerDaemon
   AdminAcceptHandler.cpp
   AdminConnectionHandler.cpp
   Catalogue.cpp
@@ -74,19 +74,19 @@ add_library(castorTapeServerDaemon
   TpconfigLine.cpp
   TpconfigLines.cpp)
 
-target_link_libraries(castorTapeServerDaemon castormessages castortapereactor  ctacommon ctanameserver ctaremotens protobuf ctascheduler)
-add_dependencies(castorTapeServerDaemon castormessagesprotobuf)
+target_link_libraries(ctaTapeServerDaemon ctamessages ctatapereactor  ctacommon ctanameserver ctaremotens protobuf ctascheduler)
+add_dependencies(ctaTapeServerDaemon ctamessagesprotobuf)
 
 add_executable(cta-tapeserverd TapeDaemon.cpp)
-target_link_libraries(cta-tapeserverd castorTapeServerDaemon SCSI System Utils 
-  File TapeDrive castorcommon castorclient castorlegacymsg castorserver 
-  castortapereactor ${LIBCAP_LIB} ${ZLIB_LIBRARIES} castormessages zmq)
+target_link_libraries(cta-tapeserverd ctaTapeServerDaemon SCSI System Utils 
+  File TapeDrive ctacommon castorclient castorlegacymsg castorserver 
+  ctatapereactor ${LIBCAP_LIB} ${ZLIB_LIBRARIES} ctamessages zmq)
 install (TARGETS cta-tapeserverd DESTINATION usr/bin)
 
-add_library(castortapeserverdaemonutils SHARED
+add_library(ctatapeserverdaemonutils SHARED
   ProcessForkerProxyDummy.cpp)
 
-add_library(castortapeserverdaemonunittests SHARED
+add_library(ctatapeserverdaemonunittests SHARED
   CatalogueDriveStateTest.cpp
   CatalogueTest.cpp
   DataTransferSessionTest.cpp
@@ -103,9 +103,9 @@ add_library(castortapeserverdaemonunittests SHARED
   TaskWatchDogTest.cpp
 )
 
-target_link_libraries(castortapeserverdaemonunittests
-  castormediachangerutils
-  castormessagesutils
-  castorserverutils
-  castortapeserverdaemonutils
+target_link_libraries(ctatapeserverdaemonunittests
+  ctamediachangerutils
+  ctamessagesutils
+  ctaserverutils
+  ctatapeserverdaemonutils
   ctaschedulerutils)

tapeserver/castor/tape/tapeserver/drive/CMakeLists.txt

@@ -29,21 +29,21 @@ add_executable(TapeDriveReadWriteTest
   TapeDriveReadWriteTest.cpp)
 target_link_libraries(TapeDriveReadWriteTest
   TapeDrive
-  castormediachanger
+  ctamediachanger
   SCSI
   System
   Utils
-  castorcommon
-  castorclient
-  castorTapeServerDaemon
+  ctacommon
+  #ctaclient
+  ctaTapeServerDaemon
   gtest
   gmock
   pthread)
 
-add_library(castortapeserverdriveunittests SHARED
+add_library(ctatapeserverdriveunittests SHARED
   DriveTest.cpp)
 
-target_link_libraries(castortapeserverdriveunittests
-  castorTapeServerDaemon
+target_link_libraries(ctatapeserverdriveunittests
+  ctaTapeServerDaemon
   System
   TapeDrive)

tapeserver/castor/tape/tapeserver/file/CMakeLists.txt

@@ -32,9 +32,9 @@ add_library(File
   ../exception/XrootCl.cpp)
 target_link_libraries (File castorrfio XrdCl cryptopp)
 
-add_library(castortapeserverfileunittests SHARED
+add_library(ctatapeserverfileunittests SHARED
   StructuresTest.cpp
   FileTest.cpp)
 
-target_link_libraries(castortapeserverfileunittests
+target_link_libraries(ctatapeserverfileunittests
   File)

tapeserver/castor/tape/tapeserver/utils/CMakeLists.txt

@@ -22,8 +22,8 @@ include_directories (${CMAKE_SOURCE_DIR}/tapeserver)
 
 add_library (Utils Regex.cpp)
 
-add_library (castortapeserverutilsunittests SHARED
+add_library (ctatapeserverutilsunittests SHARED
   RegexTest.cpp)
 
-target_link_libraries (castortapeserverutilsunittests
+target_link_libraries (ctatapeserverutilsunittests
   Utils)

tapeserver/castor/utils/CMakeLists.txt

@@ -27,9 +27,9 @@ set (UTILS_LIB_SRC_FILES
   SmartFILEPtr.cpp
   Timer.cpp
   utils.cpp)
-add_library (castorutils ${UTILS_LIB_SRC_FILES})
+add_library (ctautils ${UTILS_LIB_SRC_FILES})
 
-add_library (castorutilsunittests SHARED
+add_library (ctautilsunittests SHARED
   SmartArrayPtrTest.cpp
   SmartFdTest.cpp
   UtilsTest.cpp)

tests/CMakeLists.txt

@@ -4,19 +4,19 @@ add_executable(unittests
   unit_tests.cpp)
 
 target_link_libraries(unittests
-  castorexceptionunittests
-  castoriounittests
-  castorlegacymsgunittests
-  castorlogunittests
-  castormessagesunittests
-  castorserverunittests
-  castortapereactorunittests
-  castortapeserverdaemonunittests
-  castortapeserverdriveunittests
-  castortapeserverfileunittests
-  castortapeserverscsiunittests
-  castortapeserverutilsunittests
-  castorutilsunittests
+  ctaexceptionunittests
+  ctaiounittests
+  ctalegacymsgunittests
+  ctalogunittests
+  ctamessagesunittests
+  ctaserverunittests
+  ctatapereactorunittests
+  ctatapeserverdaemonunittests
+  ctatapeserverdriveunittests
+  ctatapeserverfileunittests
+  ctatapeserverscsiunittests
+  ctatapeserverutilsunittests
+  ctautilsunittests
   ctacommon
   ctacommonunittests
   ctaobjectstore