Commit cc5c4255 authored by Jozsef Makai's avatar Jozsef Makai

ALL: expanding the xrootd-ssi-protobuf-interface to the FST

parent 1c9d2eeb
......@@ -14,3 +14,6 @@
path = common/backward-cpp
url = https://github.com/bombela/backward-cpp.git
branch = master
[submodule "common/xrootd-ssi-protobuf-interface"]
path = common/xrootd-ssi-protobuf-interface
url = https://:@gitlab.cern.ch:8443/eos/xrootd-ssi-protobuf-interface.git
......@@ -35,6 +35,12 @@ include_directories(
${OPENSSL_INCLUDE_DIRS})
#-------------------------------------------------------------------------------
# CTA integration related operations
#-------------------------------------------------------------------------------
set(EOS_CTA_PB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/xrootd-ssi-protobuf-interface/eos_cta/protobuf/)
add_subdirectory(eos_cta_pb)
#-------------------------------------------------------------------------------
# Generate protocol buffer files
#-------------------------------------------------------------------------------
PROTOBUF_GENERATE_CPP(DBMAPTEST_SRCS DBMAPTEST_HDRS dbmaptest/test.proto)
......
......@@ -39,7 +39,6 @@ set_source_files_properties(
PROPERTIES GENERATED 1)
include_directories(${PROTOBUF3_INCLUDE_DIRS})
add_library (XrdSsiPbEosCta ${EOS_CTA_PB_SRCS})
set_target_properties(XrdSsiPbEosCta PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(XrdSsiPbEosCta PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
target_link_libraries(XrdSsiPbEosCta ${PROTOBUF3_LIBRARIES})
add_library (XrdSsiPbEosCta-Objects OBJECT
${EOS_CTA_PB_SRCS})
set_target_properties(XrdSsiPbEosCta-Objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
......@@ -25,7 +25,7 @@
#pragma once
#include "common/Logging.hh"
#include "mgm/cta_interface/eos_cta/include/CtaFrontendApi.hpp"
#include "common/xrootd-ssi-protobuf-interface/eos_cta/include/CtaFrontendApi.hpp"
// Define XRootD SSI Alert message callback
......
Subproject commit 29d7533449aef083848bde0f9a2c5214ed9bc448
......@@ -347,10 +347,12 @@ target_compile_definitions(XrdEosFst-Objects PUBLIC
-DDAEMONUID=${DAEMONUID} -DDAEMONGID=${DAEMONGID})
add_library(XrdEosFst MODULE
$<TARGET_OBJECTS:XrdEosFst-Objects>)
$<TARGET_OBJECTS:XrdEosFst-Objects>
$<TARGET_OBJECTS:XrdSsiPbEosCta-Objects>)
add_library(XrdEosFst-Shared SHARED
$<TARGET_OBJECTS:XrdEosFst-Objects>)
$<TARGET_OBJECTS:XrdEosFst-Objects>
$<TARGET_OBJECTS:XrdSsiPbEosCta-Objects>)
target_compile_definitions(XrdEosFst PUBLIC
-DDAEMONUID=${DAEMONUID} -DDAEMONGID=${DAEMONGID})
......@@ -372,6 +374,7 @@ target_link_libraries(XrdEosFst PRIVATE
${NCURSES_LIBRARIES}
${XROOTD_CL_LIBRARY}
${XOORTD_UTILS_LIBRARY}
${XROOTD_SSI_LIBRARY}
${OPENSSL_CRYPTO_LIBRARY}
${CMAKE_THREAD_LIBS_INIT})
......@@ -390,6 +393,7 @@ target_link_libraries(XrdEosFst-Shared PUBLIC
${XROOTD_CL_LIBRARY}
${XOORTD_UTILS_LIBRARY}
${XROOTD_SERVER_LIBRARY}
${XROOTD_SSI_LIBRARY}
${OPENSSL_CRYPTO_LIBRARY}
${CMAKE_THREAD_LIBS_INIT})
......
......@@ -38,14 +38,8 @@ include_directories(
${CMAKE_BINARY_DIR}/auth_plugin/
${CMAKE_SOURCE_DIR}/namespace/ns_quarkdb/qclient/include
${CMAKE_SOURCE_DIR}/namespace/ns_quarkdb/qclient/src
${CMAKE_SOURCE_DIR}/mgm/cta_interface/include
${CMAKE_BINARY_DIR}/mgm/eos_cta_pb)
#-------------------------------------------------------------------------------
# CTA integration related operations
#-------------------------------------------------------------------------------
set(EOS_CTA_PB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cta_interface/eos_cta/protobuf/)
add_subdirectory(eos_cta_pb)
${CMAKE_SOURCE_DIR}/common/xrootd-ssi-protobuf-interface/include
${CMAKE_BINARY_DIR}/common/eos_cta_pb)
#-------------------------------------------------------------------------------
# Generate protocol buffer files
......@@ -192,7 +186,8 @@ set_target_properties(
add_library(XrdEosMgm MODULE
$<TARGET_OBJECTS:EosAuthProto-Objects>
$<TARGET_OBJECTS:XrdEosMgm-Objects>)
$<TARGET_OBJECTS:XrdEosMgm-Objects>
$<TARGET_OBJECTS:XrdSsiPbEosCta-Objects>)
target_compile_definitions(
XrdEosMgm PUBLIC
......@@ -214,7 +209,6 @@ target_link_libraries(
# libEosNsCommon and don't link with the whole EosNsQuarkdb libary
EosNsQuarkdb-Shared
eosCapability-Static
XrdSsiPbEosCta
${FOLLY_LIBRARIES}
${Z_LIBRARY}
${ZMQ_LIBRARIES}
......@@ -266,7 +260,8 @@ target_link_libraries(
if(Linux)
add_library(XrdEosMgm-Shared SHARED
$<TARGET_OBJECTS:EosAuthProto-Objects>
$<TARGET_OBJECTS:XrdEosMgm-Objects>)
$<TARGET_OBJECTS:XrdEosMgm-Objects>
$<TARGET_OBJECTS:XrdSsiPbEosCta-Objects>)
target_compile_definitions(
XrdEosMgm-Shared PUBLIC
......@@ -280,7 +275,6 @@ if(Linux)
EosNsQuarkdb-Shared
eosCommonServer
eosCapability-Static
XrdSsiPbEosCta
${FOLLY_LIBRARIES}
${Z_LIBRARY}
${ZMQ_LIBRARIES}
......
......@@ -28,7 +28,7 @@
#include "common/StringTokenizer.hh"
#include "mgm/Constants.hh"
#include "mgm/Quota.hh"
#include "mgm/eos_cta_pb/EosCtaAlertHandler.hh"
#include "common/eos_cta_pb/EosCtaAlertHandler.hh"
#include "mgm/WFE.hh"
#include "mgm/Stat.hh"
#include "mgm/XrdMgmOfs.hh"
......
......@@ -29,7 +29,7 @@
#include "common/Timing.hh"
#include "common/FileId.hh"
#include "common/ThreadPool.hh"
#include "mgm/cta_interface/eos_cta/include/CtaFrontendApi.hpp"
#include "common/xrootd-ssi-protobuf-interface/eos_cta/include/CtaFrontendApi.hpp"
#include "XrdOuc/XrdOucString.hh"
#include "XrdOuc/XrdOucErrInfo.hh"
#include "Xrd/XrdJob.hh"
......
Subproject commit 29d7533449aef083848bde0f9a2c5214ed9bc448
Markdown is supported
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