Skip to content

Commit f33985d

Browse files
committed
[CMake] Remove a dependency on builtins that didn't have any effect.
The intention of __allBuiltins was to build builtins as part of moving headers. The existing code was seemingly creating a target dependency using add_custom_target(move_headers DEPENDS ${__allBuiltins}) However, this argument only accepts file dependencies. The dependency was therefore ignored. Since it doesn't seem to have caused any problems, it is removed here explicitly.
1 parent 4d0f603 commit f33985d

File tree

12 files changed

+1
-24
lines changed

12 files changed

+1
-24
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,7 @@ ROOT_ADD_TEST_SUBDIRECTORY(tutorials)
391391
ROOT_CREATE_HEADER_COPY_TARGETS()
392392

393393
get_property(__allHeaders GLOBAL PROPERTY ROOT_HEADER_TARGETS)
394-
get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
395-
add_custom_target(move_headers ALL DEPENDS ${__allHeaders} ${__allBuiltins} gitinfotxt)
394+
add_custom_target(move_headers DEPENDS ${__allHeaders} gitinfotxt)
396395

397396
#---CXX MODULES-----------------------------------------------------------------------------------
398397
if(MSVC)

builtins/davix/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,3 @@ target_link_libraries(davix INTERFACE $<BUILD_INTERFACE:${DAVIX_LIBRARIES}>)
9696
add_dependencies(davix DAVIX)
9797

9898
add_library(Davix::Davix ALIAS davix)
99-
100-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS DAVIX)

builtins/glew/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ target_link_libraries(GLEW::GLEW INTERFACE GLEW)
5050
set(GLEW_LIBRARY $<TARGET_FILE:GLEW> CACHE INTERNAL "")
5151
set(GLEW_LIBRARIES GLEW::GLEW CACHE INTERNAL "")
5252

53-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS GLEW::GLEW)
54-
5553
install(TARGETS GLEW
5654
LIBRARY DESTINATION lib
5755
ARCHIVE DESTINATION lib

builtins/lz4/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,3 @@ add_library(LZ4::LZ4 ALIAS lz4)
5252

5353
set(LZ4_LIBRARY $<TARGET_FILE:lz4> CACHE INTERNAL "")
5454
set(LZ4_LIBRARIES LZ4::LZ4 CACHE INTERNAL "")
55-
56-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS LZ4::LZ4)

builtins/nlohmann/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ add_custom_command(
1616
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/builtins/nlohmann/json.hpp ${CMAKE_BINARY_DIR}/include/nlohmann/json.hpp
1717
DEPENDS ${CMAKE_SOURCE_DIR}/builtins/nlohmann/json.hpp)
1818
add_custom_target(builtin_nlohmann_json_incl DEPENDS ${CMAKE_BINARY_DIR}/include/nlohmann/json.hpp)
19-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS builtin_nlohmann_json_incl)
2019

2120
install(FILES ${CMAKE_SOURCE_DIR}/builtins/nlohmann/json.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nlohmann/)
22-
23-

builtins/openssl/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,3 @@ find_package_handle_standard_args(OpenSSL
8484
VERSION_VAR
8585
OPENSSL_VERSION_STRING
8686
)
87-
88-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS OPENSSL)

builtins/pcre/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,3 @@ target_include_directories(pcre_builtin INTERFACE $<BUILD_INTERFACE:${PCRE_INCLU
8484
target_link_libraries(pcre_builtin INTERFACE $<BUILD_INTERFACE:${PCRE_LIBRARIES}>)
8585
add_library(PCRE::PCRE ALIAS pcre_builtin)
8686
add_dependencies(pcre_builtin PCRE)
87-
88-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS PCRE)

builtins/xrootd/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ set(XROOTD_UTILS_LIBRARIES ${XROOTD_UTILS_LIBRARIES} CACHE INTERNAL "" FORCE)
6767
list(APPEND CMAKE_BUILD_RPATH ${XROOTD_PREFIX}/lib)
6868
add_dependencies(XRootD BUILTIN_XROOTD)
6969

70-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS BUILTIN_XROOTD)
71-
7270
install(DIRECTORY ${XROOTD_PREFIX}/lib/ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries FILES_MATCHING PATTERN "libXrd*")
7371
install(DIRECTORY ${XROOTD_PREFIX}/include/xrootd/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xrootd COMPONENT headers)
7472
if(APPLE)

builtins/xxhash/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,3 @@ add_library(xxHash::xxHash ALIAS xxhash)
3030

3131
set(xxHash_LIBRARY $<TARGET_FILE:xxhash> CACHE INTERNAL "")
3232
set(xxHash_LIBRARIES xxHash::xxHash CACHE INTERNAL "")
33-
34-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS xxHash::xxHash)

builtins/zlib/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,3 @@ endif()
136136
if(DEFINED ZLIB_LIBRARY_RELEASE)
137137
set(ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARY} CACHE INTERNAL "")
138138
endif()
139-
140-
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS ZLIB::ZLIB)

0 commit comments

Comments
 (0)