Skip to content
Snippets Groups Projects
Commit 8383f2c2 authored by Steven Murray's avatar Steven Murray
Browse files

Added protobuf3 rpath to broken executables

parent 42e4b21d
No related branches found
No related tags found
No related merge requests found
......@@ -15,6 +15,9 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
set(PROTOBUF3_RPATH /usr/lib64/protobuf3)
message(STATUS "PROTOBUF3_RPATH=${PROTOBUF3_RPATH}")
find_program(PROTOBUF3_PROTOC3_EXECUTABLE
NAMES protoc3
DOC "Version 3 of The Google Protocol Buffers Compiler"
......@@ -29,7 +32,7 @@ message(STATUS "PROTOBUF3_INCLUDE_DIRS=${PROTOBUF3_INCLUDE_DIRS}")
find_library(PROTOBUF3_LIBRARIES
NAME protobuf
PATHS /usr/lib64/protobuf3
PATHS ${PROTOBUF3_RPATH}
NO_DEFAULT_PATH)
message(STATUS "PROTOBUF3_LIBRARIES=${PROTOBUF3_LIBRARIES}")
......@@ -67,4 +70,4 @@ endfunction()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Protobuf3 DEFAULT_MSG
PROTOBUF3_INCLUDE_DIRS PROTOBUF3_LIBRARIES)
PROTOBUF3_INCLUDE_DIRS PROTOBUF3_LIBRARIES PROTOBUF3_RPATH)
......@@ -14,6 +14,7 @@ add_executable (cta-taped cta-taped.cpp)
find_package(Protobuf3 REQUIRED)
target_link_libraries(cta-taped
ctatapedaemon ctacommon ${PROTOBUF3_LIBRARIES})
set_target_properties(cta-taped PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
install (TARGETS cta-taped DESTINATION usr/bin)
install (FILES TPCONFIG.example DESTINATION /etc/cta)
install (FILES cta-taped.1cta DESTINATION /usr/share/man/man1)
......
......@@ -43,6 +43,8 @@ target_link_libraries(cta-unitTests
gtest
pthread)
set_target_properties(cta-unitTests PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
add_executable(cta-catalogueUnitTests
CatalogueUnitTestsCmdLineArgs.cpp
catalogueUnitTests.cpp
......@@ -67,6 +69,8 @@ target_link_libraries(cta-unitTests-multiProcess
${PROTOBUF3_LIBRAIRES}
sqlite3)
set_target_properties(cta-unitTests-multiProcess PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
add_library(unitTestHelper
TempFile.cpp)
......
......@@ -26,6 +26,7 @@ find_package(Protobuf3 REQUIRED)
include_directories(${PROTOBUF3_INCLUDE_DIRS})
add_library (XrdCtaOfs MODULE XrdCtaFilesystem.cpp XrdCtaFile.cpp XrdCtaDir.cpp)
target_link_libraries (XrdCtaOfs ctacatalogue ctaeosmessages ctascheduler ctacommon ${PROTOBUF3_LIBRARIES} ctaobjectstore cryptopp)
set_target_properties(XrdCtaOfs PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
INSTALL (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
INSTALL (FILES xrootd-cta.cfg DESTINATION /etc/xrootd/)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment