Skip to content

Commit d5fcd13

Browse files
hageboeckdpiparo
authored andcommitted
[CMake] Correctly specify names of XRootD's build products.
The names of the build byproducts need to be specified with full paths for Ninja. Fix #19333
1 parent 1898c34 commit d5fcd13

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

builtins/xrootd/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ set(XROOTD_PREFIX ${CMAKE_BINARY_DIR}/XROOTD-prefix)
1111

1212
message(STATUS "Downloading and building XROOTD version ${XROOTD_VERSION}")
1313

14+
set(XROOTD_INCLUDE_DIRS ${XROOTD_PREFIX}/include/xrootd CACHE INTERNAL "" FORCE)
15+
set(XRDCL_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}XrdCl${CMAKE_SHARED_LIBRARY_SUFFIX})
16+
set(XRDUTILS_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}XrdUtils${CMAKE_SHARED_LIBRARY_SUFFIX})
17+
set(XROOTD_CLIENT_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDCL_NAME} CACHE INTERNAL "" FORCE)
18+
set(XROOTD_UTILS_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDUTILS_NAME} CACHE INTERNAL "" FORCE)
19+
set(XROOTD_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDCL_NAME} CACHE INTERNAL "" FORCE)
20+
1421
ExternalProject_Add(
1522
BUILTIN_XROOTD
1623
URL http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources/xrootd-${XROOTD_VERSION}.tar.gz
@@ -34,7 +41,7 @@ ExternalProject_Add(
3441
-DOPENSSL_ROOT=${OPENSSL_ROOT}
3542
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
3643
LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
37-
BUILD_BYPRODUCTS XrdUtils XrdCl
44+
BUILD_BYPRODUCTS ${XROOTD_UTILS_LIBRARIES} ${XROOTD_CLIENT_LIBRARIES}
3845
TIMEOUT 600
3946
)
4047

@@ -45,13 +52,6 @@ if(builtin_openssl)
4552
add_dependencies(BUILTIN_XROOTD OPENSSL)
4653
endif()
4754

48-
set(XROOTD_INCLUDE_DIRS ${XROOTD_PREFIX}/include/xrootd CACHE INTERNAL "" FORCE)
49-
set(XRDCL_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}XrdCl${CMAKE_SHARED_LIBRARY_SUFFIX})
50-
set(XRDUTILS_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}XrdUtils${CMAKE_SHARED_LIBRARY_SUFFIX})
51-
set(XROOTD_CLIENT_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDCL_NAME} CACHE INTERNAL "" FORCE)
52-
set(XROOTD_UTILS_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDUTILS_NAME} CACHE INTERNAL "" FORCE)
53-
set(XROOTD_LIBRARIES ${XROOTD_PREFIX}/lib/${XRDCL_NAME} CACHE INTERNAL "" FORCE)
54-
5555
install(DIRECTORY ${XROOTD_PREFIX}/lib/ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries FILES_MATCHING PATTERN "libXrd*")
5656
install(DIRECTORY ${XROOTD_PREFIX}/include/xrootd/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xrootd COMPONENT headers)
5757
set(CMAKE_BUILD_RPATH ${CMAKE_BUILD_RPATH} ${XROOTD_PREFIX}/lib PARENT_SCOPE)

0 commit comments

Comments
 (0)