Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
ff33ba8c
Commit
ff33ba8c
authored
Dec 06, 2019
by
Eric Cano
Browse files
#656: created a bare-minimum cta-lib-base for cli.
parent
5d8bb384
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmdline/CMakeLists.txt
View file @
ff33ba8c
...
...
@@ -33,7 +33,7 @@ include_directories(${CMAKE_BINARY_DIR}/eos_cta ${PROTOBUF3_INCLUDE_DIRS})
# cta-admin <admin_command> is the SSI version of "cta <admin_command>"
#
add_executable
(
cta-admin CtaAdminCmd.cpp CtaAdminCmdParse.cpp CtaAdminTextFormatter.cpp
)
target_link_libraries
(
cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils cta
common
)
target_link_libraries
(
cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils cta
base
)
set_property
(
TARGET cta-admin APPEND PROPERTY INSTALL_RPATH
${
PROTOBUF3_RPATH
}
)
#
...
...
@@ -44,7 +44,7 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#
find_package
(
cryptopp REQUIRED
)
add_executable
(
cta-wfe-test EosCtaStub.cpp
)
target_link_libraries
(
cta-wfe-test cryptopp cta
common
XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils
)
target_link_libraries
(
cta-wfe-test cryptopp cta
base
XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils
)
set_property
(
TARGET cta-wfe-test APPEND PROPERTY INSTALL_RPATH
${
PROTOBUF3_RPATH
}
)
install
(
TARGETS cta-admin DESTINATION usr/bin
)
...
...
common/CMakeLists.txt
View file @
ff33ba8c
...
...
@@ -30,9 +30,7 @@ include_directories (${XROOTD_INCLUDE_DIR})
#
include_directories
(
${
CMAKE_BINARY_DIR
}
/eos_cta
${
PROTOBUF3_INCLUDE_DIRS
}
)
set_source_files_properties
(
CRC.cpp PROPERTIES COMPILE_FLAGS -O2
)
set
(
COMMON_LIB_SRC_FILES
set
(
BASE_LIB_SRC_FILES
dataStructures/ActivitiesFairShareWeights.cpp
dataStructures/AdminUser.cpp
dataStructures/ArchiveFile.cpp
...
...
@@ -76,15 +74,27 @@ set (COMMON_LIB_SRC_FILES
dataStructures/WriteTestResult.cpp
dataStructures/utils.cpp
checksum/ChecksumBlob.cpp
exception/Backtrace.cpp
exception/Exception.cpp
)
add_library
(
ctabase SHARED
${
BASE_LIB_SRC_FILES
}
)
set_property
(
TARGET ctabase PROPERTY SOVERSION
"
${
CTA_SOVERSION
}
"
)
set_property
(
TARGET ctabase PROPERTY VERSION
"
${
CTA_LIBVERSION
}
"
)
install
(
TARGETS ctabase DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
set_source_files_properties
(
CRC.cpp PROPERTIES COMPILE_FLAGS -O2
)
set
(
COMMON_LIB_SRC_FILES
exception/AcceptConnectionInterrupted.cpp
exception/AcsQueryVolumeCmd.cpp
exception/Backtrace.cpp
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
exception/DismountFailed.cpp
exception/ForceDismountFailed.cpp
exception/Errnum.cpp
exception/Exception.cpp
exception/InvalidArgument.cpp
exception/InvalidConfigEntry.cpp
exception/LostDatabaseConnection.cpp
...
...
@@ -157,6 +167,7 @@ set_property(TARGET ctacommon PROPERTY VERSION "${CTA_LIBVERSION}")
install
(
TARGETS ctacommon DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
target_link_libraries
(
ctacommon
ctabase
XrdSsiPbEosCta
pthread
uuid
...
...
cta.spec.in
View file @
ff33ba8c
...
...
@@ -186,6 +186,18 @@ The xroot plugin
%attr(0755,root,root) %{_bindir}/cta-wfe-test
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
%package -n cta-lib-base
Summary: CERN Tape Archive libraries
Group: Application/CTA
# Explicity require protobuf3 to avoid clash with eos-protobuf3
Requires: protobuf3
%description -n cta-lib-base
CERN Tape Archive:
The shared libraries base
%files -n cta-lib-base
%defattr(0755,root,root,-)
%{_libdir}/libctabase.so*
%package -n cta-lib
Summary: CERN Tape Archive libraries
Group: Application/CTA
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment