From fbc3f86f3c913bb5f1e823d02cd43c6b6e60330c Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 18 Dec 2017 14:30:21 +0100
Subject: [PATCH] [xrd_ssi] Renames XRootD SSI EOS-CTA protobuf static library
to libXrdSsiPbEosCta.a
---
cmdline/CMakeLists.txt | 4 ++--
xroot_plugins/CMakeLists.txt | 2 +-
xrootd-ssi-protobuf-interface | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index 4eece7bdda..1312cdfe44 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -44,7 +44,7 @@ include_directories(${CMAKE_BINARY_DIR}/${XRD_SSI_PB_DIR}/eos_cta/protobuf ${PRO
# eosctastub is a drop-in replacement for "cta archive|retrieve|delete"
#
add_executable(eoscta_stub EosCtaStub.cpp Configuration.cpp)
-target_link_libraries(eoscta_stub cryptopp ctacommon XrdCtaMessages XrdSsi-4 XrdSsiLib)
+target_link_libraries(eoscta_stub cryptopp ctacommon XrdSsiPbEosCta XrdSsi-4 XrdSsiLib)
set_property (TARGET eoscta_stub APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
# Get some extra debug messages on stdout
#target_compile_definitions(eoscta_stub PUBLIC XRDSSI_DEBUG)
@@ -54,7 +54,7 @@ install(TARGETS eoscta_stub DESTINATION usr/bin)
# cta-admin <admin_command> is the SSI version of "cta <admin_command>"
#
add_executable(cta-admin CtaAdminCmd.cpp CtaAdminCmdParse.cpp Configuration.cpp)
-target_link_libraries(cta-admin XrdCtaMessages XrdSsi-4 XrdSsiLib)
+target_link_libraries(cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib)
set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
# Get some extra debug messages on stdout
#target_compile_definitions(cta-admin PUBLIC XRDSSI_DEBUG)
diff --git a/xroot_plugins/CMakeLists.txt b/xroot_plugins/CMakeLists.txt
index fcbf9cfd31..58110ebf53 100644
--- a/xroot_plugins/CMakeLists.txt
+++ b/xroot_plugins/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories(${CMAKE_BINARY_DIR}/${XRD_SSI_PB_DIR}/eos_cta/protobuf ${PRO
# XRootD SSI plugin for CTA Frontend
#
add_library(XrdSsiCta MODULE XrdSsiCtaServiceProvider.cpp XrdSsiCtaRequestProc.cpp XrdSsiCtaRequestMessage.cpp ../cmdline/CtaAdminCmdParse.cpp)
-target_link_libraries(XrdSsiCta XrdSsi-4 XrdSsiLib XrdCtaMessages ctascheduler ctacommon ctaobjectstore ctacatalogue)
+target_link_libraries(XrdSsiCta XrdSsi-4 XrdSsiLib XrdSsiPbEosCta ctascheduler ctacommon ctaobjectstore ctacatalogue)
set_property (TARGET XrdSsiCta APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_property (TARGET XrdSsiCta APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index 5399432079..3f8cf92aef 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit 5399432079b1c3382865929cf987d0fc3c1ab33a
+Subproject commit 3f8cf92aef9d3ab90482cf168508f9204c8e098e
--
GitLab