From 4ec4a97e1c57d63e5c20cc6547dfd74574b6635f Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 18 Dec 2017 16:21:27 +0100
Subject: [PATCH] [xrd_ssi_pb] Adds protocol buffers and skeleton for test
client/server
---
CMakeLists.txt | 5 +++++
cmdline/CMakeLists.txt | 3 ---
xroot_plugins/CMakeLists.txt | 3 ---
xrootd-ssi-protobuf-interface | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec81e0780b..b149e8b0f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,11 @@ ELSE(DEFINED PackageOnly)
install (CODE "message (STATUS \"Installing directory \$ENV{DESTDIR}/var/log/cta\")")
install (CODE "file (MAKE_DIRECTORY \$ENV{DESTDIR}/var/log/cta)")
+ #
+ # Location of git submodule containing the XRootD SSI Protocol Buffer bindings
+ #
+ set(XRD_SSI_PB_DIR xrootd-ssi-protobuf-interface)
+
add_subdirectory(xrootd-ssi-protobuf-interface)
add_subdirectory(cmdline)
add_subdirectory(xroot_plugins)
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index 1312cdfe44..690442d3e5 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -30,9 +30,6 @@ include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_INCLUDE_DIR}/private)
#
# XRootD SSI Protocol Buffer bindings
#
-# This is a git submodule
-#
-set(XRD_SSI_PB_DIR xrootd-ssi-protobuf-interface)
include_directories(${CMAKE_SOURCE_DIR}/${XRD_SSI_PB_DIR}/include ${CMAKE_SOURCE_DIR}/${XRD_SSI_PB_DIR}/eos_cta/include)
#
diff --git a/xroot_plugins/CMakeLists.txt b/xroot_plugins/CMakeLists.txt
index 58110ebf53..068b6c6c69 100644
--- a/xroot_plugins/CMakeLists.txt
+++ b/xroot_plugins/CMakeLists.txt
@@ -26,9 +26,6 @@ include_directories(${CMAKE_SOURCE_DIR}/tapeserver)
#
# XRootD SSI Protocol Buffer bindings
#
-# This is a git submodule
-#
-set(XRD_SSI_PB_DIR xrootd-ssi-protobuf-interface)
include_directories(${CMAKE_SOURCE_DIR}/${XRD_SSI_PB_DIR}/include ${CMAKE_SOURCE_DIR}/${XRD_SSI_PB_DIR}/eos_cta/include)
#
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index 3f8cf92aef..bfa5fa6d19 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit 3f8cf92aef9d3ab90482cf168508f9204c8e098e
+Subproject commit bfa5fa6d196286f99a0581d4e0181b887bb3d8db
--
GitLab