Commit 1f9d4143 authored by Elvin Sindrilaru's avatar Elvin Sindrilaru
Browse files

XROOTD: In XRootD 4.1 there is no longer an OFS library therefore we need to link

        against the XrdServer library which contains also the old OFS library.
parent 1712fee0
......@@ -31,7 +31,7 @@
# the xrootd ABI.
# XROOTD_XRDCL_LIB - location of the XrdCl library
# XROOTD_XRDCLIENT_LIB - location of the XrdClient library
# XROOTD_XRDOFS_LIB - location of the XrdOfs library
# XROOTD_XRDSERVER_LIB - location of the XrdServer library
# XROOTD_XRDUTILS_LIB - location of the XrdUtils library
# XROOTD_XRDPOSIX_LIB - location of the XrdPosix library
......@@ -50,7 +50,7 @@ find_path (XROOTD_PRIVATE_INCLUDE_DIR XrdOss/XrdOssApi.hh
find_library (XROOTD_XRDCL_LIB XrdCl)
find_library (XROOTD_XRDCLIENT_LIB XrdClient)
find_library (XROOTD_XRDOFS_LIB XrdOfs)
find_library (XROOTD_XRDSERVER_LIB XrdServer)
find_library (XROOTD_XRDUTILS_LIB XrdUtils)
find_library (XROOTD_XRDPOSIX_LIB XrdPosixPreload)
......@@ -58,7 +58,7 @@ message (STATUS "XROOTD_INCLUDE_DIR = ${XROOTD_INCLUDE_DIR}")
message (STATUS "XROOTD_PRIVATE_INCLUDE_DIR = ${XROOTD_PRIVATE_INCLUDE_DIR}")
message (STATUS "XROOTD_XRDCL_LIB = ${XROOTD_XRDCL_LIB}")
message (STATUS "XROOTD_XRDCLIENT_LIB = ${XROOTD_XRDCLIENT_LIB}")
message (STATUS "XROOTD_XRDOFS_LIB = ${XROOTD_XRDOFS_LIB}")
message (STATUS "XROOTD_XRDSERVER_LIB = ${XROOTD_XRDSERVER_LIB}")
message (STATUS "XROOTD_XRDPOSIX_LIB = ${XROOTD_XRDPOSIX_LIB}")
include (FindPackageHandleStandardArgs)
......@@ -67,6 +67,6 @@ find_package_handle_standard_args (xrootd DEFAULT_MSG
XROOTD_PRIVATE_INCLUDE_DIR
XROOTD_XRDCL_LIB
XROOTD_XRDCLIENT_LIB
XROOTD_XRDOFS_LIB
XROOTD_XRDSERVER_LIB
XROOTD_XRDUTILS_LIB
XROOTD_XRDPOSIX_LIB)
......@@ -45,7 +45,7 @@ CastorSetLibraryVersions (xrdxcastor2fs)
set_property (TARGET xrdxcastor2fs
APPEND PROPERTY COMPILE_DEFINITIONS _FILE_OFFSET_BITS=64)
target_link_libraries (xrdxcastor2fs castorclient castorcommon castorns crypto
${XROOTD_XRDOFS_LIB} ${XROOTD_XRDUTILS_LIB} ${UUID_LIB})
${XROOTD_XRDSERVER_LIB} ${XROOTD_XRDUTILS_LIB} ${UUID_LIB})
install (TARGETS xrdxcastor2fs DESTINATION ${CASTOR_DEST_LIB_DIR})
################################################################################
......@@ -75,7 +75,7 @@ CastorSetLibraryVersions (xrdxcastor2ofs)
set_property (TARGET xrdxcastor2ofs
APPEND PROPERTY COMPILE_DEFINITIONS _FILE_OFFSET_BITS=64)
target_link_libraries (xrdxcastor2ofs crypto castormovers castorcephposix z
${XROOTD_XRDCL_LIB} ${XROOTD_XRDCLIENT_LIB} ${XROOTD_XRDOFS_LIB} ${UUID_LIB}
${XROOTD_XRDCL_LIB} ${XROOTD_XRDCLIENT_LIB} ${XROOTD_XRDSERVER_LIB} ${UUID_LIB}
${RADOS_LIBS})
install (TARGETS xrdxcastor2ofs DESTINATION ${CASTOR_DEST_LIB_DIR})
......
......@@ -59,7 +59,7 @@ extern XrdSysError OfsEroute;
extern XrdOssSys* XrdOfsOss;
extern XrdOss* XrdOssGetSS(XrdSysLogger*, const char*, const char*);
XrdVERSIONINFO(XrdSfsGetFileSystem, xCastor2Ofs);
XrdVERSIONINFO(XrdSfsGetFileSystem2, xCastor2Ofs);
// One minute for destination to contact us for tpc.key rendez-vous
const int XrdxCastor2OfsFile::sKeyExpiry = 60;
......
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