Skip to content

Commit

Permalink
[CMake] Replace setting blank link properties with private linking
Browse files Browse the repository at this point in the history
Originally introduced in 220e15e to
prevent overlinking, setting an empty INTERFACE_LINK_LIBRARIES can now
be replaced with target_link_libraries with PRIVATE linking.
  • Loading branch information
amadio committed Jun 5, 2023
1 parent 79c966a commit b8741c1
Show file tree
Hide file tree
Showing 25 changed files with 73 additions and 237 deletions.
17 changes: 3 additions & 14 deletions src/XrdApps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ add_library(

target_link_libraries(
XrdAppUtils
PRIVATE
XrdUtils )

set_target_properties(
Expand All @@ -179,13 +180,7 @@ add_library(
XrdApps/XrdClProxyPlugin/ProxyPrefixPlugin.cc
XrdApps/XrdClProxyPlugin/ProxyPrefixFile.cc)

target_link_libraries(${LIB_XRDCL_PROXY_PLUGIN} XrdCl)

set_target_properties(
${LIB_XRDCL_PROXY_PLUGIN}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
target_link_libraries(${LIB_XRDCL_PROXY_PLUGIN} PRIVATE XrdCl)

#-------------------------------------------------------------------------------
# XrdClRecorder library
Expand All @@ -195,13 +190,7 @@ add_library(
MODULE
XrdApps/XrdClRecordPlugin/XrdClRecorderPlugin.cc )

target_link_libraries(${LIB_XRDCL_RECORDER_PLUGIN} XrdCl)

set_target_properties(
${LIB_XRDCL_RECORDER_PLUGIN}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
target_link_libraries(${LIB_XRDCL_RECORDER_PLUGIN} PRIVATE XrdCl)

add_executable(
xrdreplay
Expand Down
19 changes: 4 additions & 15 deletions src/XrdCeph/src/XrdCeph.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,15 @@ set_property(SOURCE XrdCeph/XrdCephPosix.cc

target_link_libraries(
XrdCephPosix
PRIVATE
${XROOTD_LIBRARIES}
${RADOS_LIBS} )

set_target_properties(
XrdCephPosix
PROPERTIES
VERSION ${XRD_CEPH_POSIX_VERSION}
SOVERSION ${XRD_CEPH_POSIX_SOVERSION}
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
SOVERSION ${XRD_CEPH_POSIX_SOVERSION} )

#-------------------------------------------------------------------------------
# The XrdCeph module
Expand All @@ -49,15 +48,10 @@ add_library(

target_link_libraries(
${LIB_XRD_CEPH}
PRIVATE
${XROOTD_LIBRARIES}
XrdCephPosix )

set_target_properties(
${LIB_XRD_CEPH}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# The XrdCephXattr module
#-------------------------------------------------------------------------------
Expand All @@ -70,15 +64,10 @@ add_library(

target_link_libraries(
${LIB_XRD_CEPH_XATTR}
PRIVATE
${XROOTD_LIBRARIES}
XrdCephPosix )

set_target_properties(
${LIB_XRD_CEPH_XATTR}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# Install
#-------------------------------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion src/XrdCl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ add_library(

target_link_libraries(
XrdCl
PRIVATE
XrdXml
XrdUtils
uuid::uuid
Expand All @@ -125,7 +126,7 @@ set_target_properties(

if( BUILD_XRDEC )
target_include_directories(XrdCl PUBLIC ${ISAL_INCLUDE_DIRS})
target_link_libraries(XrdCl ${ISAL_LIBRARIES})
target_link_libraries(XrdCl PRIVATE ${ISAL_LIBRARIES})
endif()

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -157,6 +158,7 @@ add_executable(
target_link_libraries(
xrdcp
XrdCl
XrdUtils
XrdAppUtils )
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/XrdClHttp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ set(PLUGIN_NAME "XrdClHttp-${PLUGIN_VERSION}")

add_library(${PLUGIN_NAME} MODULE ${libXrdClHttp_sources})

target_link_libraries(${PLUGIN_NAME} Davix::Davix XrdCl XrdUtils)
target_link_libraries(${PLUGIN_NAME} PRIVATE Davix::Davix XrdCl XrdUtils)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
17 changes: 5 additions & 12 deletions src/XrdCrypto.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ add_library(

target_link_libraries(
XrdCrypto
PRIVATE
XrdUtils
${CMAKE_DL_LIBS} )

set_target_properties(
XrdCrypto
PROPERTIES
VERSION ${XRD_CRYPTO_VERSION}
SOVERSION ${XRD_CRYPTO_SOVERSION}
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
SOVERSION ${XRD_CRYPTO_SOVERSION} )

#-------------------------------------------------------------------------------
# The XrdCryptoLite library
Expand All @@ -64,16 +63,15 @@ add_library(

target_link_libraries(
XrdCryptoLite
PRIVATE
XrdUtils
OpenSSL::Crypto )

set_target_properties(
XrdCryptoLite
PROPERTIES
VERSION ${XRD_CRYPTO_LITE_VERSION}
SOVERSION ${XRD_CRYPTO_LITE_SOVERSION}
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
SOVERSION ${XRD_CRYPTO_LITE_SOVERSION} )

#-------------------------------------------------------------------------------
# The XrdCryptossl module
Expand All @@ -98,17 +96,12 @@ add_library(

target_link_libraries(
${LIB_XRD_CRYPTOSSL}
PRIVATE
XrdCrypto
XrdUtils
${CMAKE_THREAD_LIBS_INIT}
OpenSSL::SSL )

set_target_properties(
${LIB_XRD_CRYPTOSSL}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# Install
#-------------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions src/XrdEc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ add_library(
XrdEcReader.hh XrdEcReader.cc
)

target_link_libraries(
XrdEc
XrdCl
)
target_link_libraries(XrdEc PRIVATE XrdCl ${ISAL_LIBRARIES})
target_include_directories(XrdEc PRIVATE ${ISAL_INCLUDE_DIRS})

set_target_properties(
XrdEc
Expand Down
5 changes: 2 additions & 3 deletions src/XrdFfs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ add_library(

target_link_libraries(
XrdFfs
PRIVATE
XrdCl
XrdPosix
XrdUtils
Expand All @@ -30,9 +31,7 @@ set_target_properties(
XrdFfs
PROPERTIES
VERSION ${XRD_FFS_VERSION}
SOVERSION ${XRD_FFS_SOVERSION}
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )
SOVERSION ${XRD_FFS_SOVERSION} )

#-------------------------------------------------------------------------------
# xrootdfs
Expand Down
3 changes: 3 additions & 0 deletions src/XrdHttp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,19 @@ if( BUILD_HTTP )

target_link_libraries(
${LIB_XRD_HTTP_UTILS}
PRIVATE
XrdServer
XrdUtils
XrdCrypto
${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT}
PUBLIC
OpenSSL::SSL
OpenSSL::Crypto )

target_link_libraries(
${MOD_XRD_HTTP}
PRIVATE
XrdUtils
${LIB_XRD_HTTP_UTILS} )

Expand Down
8 changes: 4 additions & 4 deletions src/XrdMacaroons.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ if( BUILD_MACAROONS )
XrdMacaroons/XrdMacaroonsConfigure.cc)

target_link_libraries(
${LIB_XRD_MACAROONS} ${CMAKE_DL_LIBS}
${LIB_XRD_MACAROONS}
PRIVATE
XrdHttpUtils
XrdUtils
XrdServer
uuid::uuid
${MACAROONS_LIB}
${JSON_LIBRARIES}
${XROOTD_HTTP_LIB}
OpenSSL::Crypto)
OpenSSL::Crypto
${CMAKE_DL_LIBS})

if( MacOSX )
SET( MACAROONS_LINK_FLAGS "-Wl")
Expand All @@ -39,8 +41,6 @@ if( BUILD_MACAROONS )
set_target_properties(
${LIB_XRD_MACAROONS}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES ""
LINK_FLAGS "${MACAROONS_LINK_FLAGS}")

#-----------------------------------------------------------------------------
Expand Down
7 changes: 1 addition & 6 deletions src/XrdOssCsi.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@ add_library(

target_link_libraries(
${LIB_XRD_OSSCSI}
PRIVATE
XrdUtils
XrdServer
${CMAKE_THREAD_LIBS_INIT} )

set_target_properties(
${LIB_XRD_OSSCSI}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# Install
#-------------------------------------------------------------------------------
Expand Down
14 changes: 2 additions & 12 deletions src/XrdPfc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,13 @@ add_library(

target_link_libraries(
${LIB_XRD_FILECACHE}
PRIVATE
# XrdPosix
XrdCl
XrdUtils
XrdServer
${CMAKE_THREAD_LIBS_INIT} )

set_target_properties(
${LIB_XRD_FILECACHE}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# The XrdBlacklistDecision library
#-------------------------------------------------------------------------------
Expand All @@ -54,15 +49,10 @@ add_library(

target_link_libraries(
${LIB_XRD_BLACKLIST}
PRIVATE
XrdUtils
)

set_target_properties(
${LIB_XRD_BLACKLIST}
PROPERTIES
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

#-------------------------------------------------------------------------------
# xrdpfc_print
#-------------------------------------------------------------------------------
Expand Down

0 comments on commit b8741c1

Please sign in to comment.