Commit 41f8a702 authored by Steven Murray's avatar Steven Murray
Browse files

Replaced set_target_properties( .. .. INSTALL_RPATH ..) with set_property...

Replaced set_target_properties( .. .. INSTALL_RPATH ..) with set_property (TARGET .. APPEND PROPERTY INSTALL_RPATH ..)
parent 96e2ceda
......@@ -54,7 +54,7 @@ set_property(TARGET ctacatalogue PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET ctacatalogue PROPERTY VERSION "${CTA_LIBVERSION}")
if (OCCI_SUPPORT)
set_target_properties(ctacatalogue PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET ctacatalogue APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
install (TARGETS ctacatalogue DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
......@@ -133,7 +133,7 @@ target_link_libraries (cta-catalogue-schema-create
ctacatalogue)
if (OCCI_SUPPORT)
set_target_properties (cta-catalogue-schema-create PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-catalogue-schema-create APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OOCI_SUPPORT)
install (TARGETS cta-catalogue-schema-create DESTINATION /usr/bin)
......@@ -148,7 +148,7 @@ target_link_libraries (cta-catalogue-schema-drop
ctacatalogue)
if (OCCI_SUPPORT)
set_target_properties (cta-catalogue-schema-drop PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-catalogue-schema-drop APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OOCI_SUPPORT)
install (TARGETS cta-catalogue-schema-drop DESTINATION /usr/bin)
......@@ -163,7 +163,7 @@ target_link_libraries (cta-database-poll
ctacatalogue)
if (OCCI_SUPPORT)
set_target_properties (cta-database-poll PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-database-poll APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OOCI_SUPPORT)
install (TARGETS cta-database-poll DESTINATION /usr/bin)
......@@ -178,7 +178,7 @@ target_link_libraries (cta-catalogue-admin-user-create
ctacatalogue)
if (OCCI_SUPPORT)
set_target_properties (cta-catalogue-admin-user-create PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-catalogue-admin-user-create APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OOCI_SUPPORT)
install (TARGETS cta-catalogue-admin-user-create DESTINATION /usr/bin)
......@@ -193,7 +193,7 @@ target_link_libraries (cta-catalogue-admin-host-create
ctacatalogue)
if (OCCI_SUPPORT)
set_target_properties (cta-catalogue-admin-host-create PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-catalogue-admin-host-create APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OOCI_SUPPORT)
install (TARGETS cta-catalogue-admin-host-create DESTINATION /usr/bin)
......
......@@ -39,7 +39,7 @@ find_package(cryptopp REQUIRED)
include_directories(${PROTOBUF3_INCLUDE_DIRS} ${XROOTD_INCLUDE_DIR} ${XROOTD_INCLUDE_DIR}/private ../xroot_ssi_pb)
add_executable(eoscta_stub EosCtaStub.cpp Configuration.cpp)
target_link_libraries(eoscta_stub cryptopp XrdCtaMessages XrdSsi-4 XrdSsiLib)
set_target_properties(eoscta_stub PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET eoscta_stub APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
# Get some extra debug messages on stdout
target_compile_definitions(eoscta_stub PUBLIC XRDSSI_DEBUG)
install(TARGETS eoscta_stub DESTINATION usr/bin)
......@@ -50,6 +50,6 @@ install(TARGETS eoscta_stub DESTINATION usr/bin)
add_executable(cta_admin CtaAdminCmd.cpp CtaAdminCmdParse.cpp Configuration.cpp)
target_link_libraries(cta_admin XrdCtaMessages XrdSsi-4 XrdSsiLib)
set_target_properties(cta_admin PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET cta_admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
install(TARGETS cta_admin DESTINATION usr/bin)
......@@ -94,8 +94,8 @@ set (MEDIA_CHANGER_MOUNT_SRC_FILES
add_executable (cta-mediachanger-mount ${MEDIA_CHANGER_MOUNT_SRC_FILES})
set_target_properties (cta-mediachanger-mount PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX
INSTALL_RPATH ${PROTOBUF3_RPATH})
COMPILE_DEFINITIONS LINUX)
set_property (TARGET cta-mediachanger-mount APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries (cta-mediachanger-mount
ctacommon
ctamediachanger)
......@@ -110,8 +110,8 @@ add_executable (cta-mediachanger-dismount
${MEDIA_CHANGER_DISMOUNT_SRC_FILES})
set_target_properties (cta-mediachanger-dismount PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX
INSTALL_RPATH ${PROTOBUF3_RPATH})
COMPILE_DEFINITIONS LINUX)
set_property (TARGET cta-mediachanger-dismount APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries (cta-mediachanger-dismount
ctacommon
ctamediachanger)
......
......@@ -93,32 +93,32 @@ target_link_libraries(ctaobjectstoreunittests
install(TARGETS ctaobjectstoreunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
add_executable(cta-objectstore-initialize cta-objectstore-initialize.cpp)
set_target_properties(cta-objectstore-initialize PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-initialize APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-initialize
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon ctautils)
add_executable(cta-objectstore-list cta-objectstore-list.cpp)
set_target_properties(cta-objectstore-list PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-list APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-list
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon)
add_executable(cta-objectstore-dump-object cta-objectstore-dump-object.cpp)
set_target_properties(cta-objectstore-dump-object PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-dump-object APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-dump-object
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon)
add_executable(cta-objectstore-unfollow-agent cta-objectstore-unfollow-agent.cpp)
set_target_properties(cta-objectstore-unfollow-agent PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-unfollow-agent APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-unfollow-agent
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon)
add_executable(cta-objectstore-dereference-removed-queues cta-objectstore-dereference-removed-queues.cpp)
set_target_properties(cta-objectstore-dereference-removed-queues PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-dereference-removed-queues APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-dereference-removed-queues
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon)
add_executable(cta-objectstore-collect-orphaned-object cta-objectstore-collect-orphaned-object.cpp)
set_target_properties(cta-objectstore-collect-orphaned-object PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET cta-objectstore-collect-orphaned-object APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
target_link_libraries(cta-objectstore-collect-orphaned-object
${PROTOBUF3_LIBRARIES} ctaobjectstore ctacommon ctacatalogue)
......
......@@ -14,10 +14,9 @@ add_executable (cta-taped cta-taped.cpp)
find_package(Protobuf3 REQUIRED)
target_link_libraries(cta-taped
ctatapedaemon ctacommon ${PROTOBUF3_LIBRARIES})
set_property (TARGET cta-taped APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_target_properties(cta-taped PROPERTIES INSTALL_RPATH "${ORACLE-INSTANTCLIENT_RPATH};${PROTOBUF3_RPATH}")
else (OCCI_SUPPORT)
set_target_properties(cta-taped PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET cta-taped APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
install (TARGETS cta-taped DESTINATION usr/bin)
install (FILES TPCONFIG.example DESTINATION /etc/cta)
......
......@@ -43,10 +43,9 @@ target_link_libraries(cta-unitTests
gtest
pthread)
set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_target_properties (cta-unitTests PROPERTIES INSTALL_RPATH "${ORACLE-INSTANTCLIENT_RPATH};${PROTOBUF3_RPATH}")
else (OCCI_SUPPORT)
set_target_properties (cta-unitTests PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
add_executable(cta-catalogueUnitTests
......@@ -61,7 +60,7 @@ target_link_libraries(cta-catalogueUnitTests
pthread)
if (OCCI_SUPPORT)
set_target_properties(cta-catalogueUnitTests PROPERTIES INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
set_property (TARGET cta-catalogueUnitTests APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
add_executable(cta-unitTests-multiProcess
......@@ -77,10 +76,9 @@ target_link_libraries(cta-unitTests-multiProcess
${PROTOBUF3_LIBRAIRES}
sqlite3)
set_property (TARGET cta-unitTests-multiProcess APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_target_properties (cta-unitTests-multiProcess PROPERTIES INSTALL_RPATH "${ORACLE-INSTANTCLIENT_RPATH};${PROTOBUF3_RPATH}")
else (OOCI_SUPPORT)
set_target_properties (cta-unitTests-multiProcess PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET cta-unitTests-multiProcess APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
add_library(unitTestHelper
......
......@@ -31,10 +31,9 @@ add_library (XrdCtaOfs MODULE ListArchiveFilesCmd.cpp XrdCtaFilesystem.cpp XrdCt
set_property(TARGET XrdCtaOfs PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET XrdCtaOfs PROPERTY VERSION "${CTA_LIBVERSION}")
target_link_libraries (XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaobjectstore cryptopp)
set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_target_properties (XrdCtaOfs PROPERTIES INSTALL_RPATH "${ORACLE-INSTANTCLIENT_RPATH};${PROTOBUF3_RPATH}")
else (OCCI_SUPPORT)
set_target_properties (XrdCtaOfs PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
# XRootD SSI plugin for CTA Frontend
......@@ -45,10 +44,9 @@ include_directories(../xroot_ssi_pb)
add_library(XrdSsiCta MODULE XrdSsiCtaServiceProvider.cpp XrdSsiCtaRequestProc.cpp XrdSsiCtaRequestMessage.cpp ../cmdline/CtaAdminCmdParse.cpp ListArchiveFilesCmd.cpp)
target_link_libraries(XrdSsiCta XrdSsi-4 XrdSsiLib XrdCtaMessages ctascheduler ctacommon ctaobjectstore ctacatalogue)
set_property (TARGET XrdSsiCta APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_target_properties (XrdSsiCta PROPERTIES INSTALL_RPATH "${ORACLE-INSTANTCLIENT_RPATH};${PROTOBUF3_RPATH}")
else (OCCI_SUPPORT)
set_target_properties (XrdSsiCta PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property (TARGET XrdSsiCta APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
endif (OCCI_SUPPORT)
# Get some extra debug messages on stdout
target_compile_definitions(XrdSsiCta PRIVATE XRDSSI_DEBUG)
......
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