[builtins] download instead of bundle xxhash and bump from 0.8.0 to 0.8.3#21806
[builtins] download instead of bundle xxhash and bump from 0.8.0 to 0.8.3#21806ferdymercury wants to merge 12 commits intoroot-project:masterfrom
Conversation
Test Results 22 files 22 suites 3d 6h 56m 29s ⏱️ Results for commit f94d4a9. ♻️ This comment has been updated with latest results. |
add CMakeLists patch rm bundled copy
| set(xxHash_LIBRARY $<TARGET_FILE:xxhash> CACHE INTERNAL "") | ||
| set(xxHash_LIBRARIES xxHash::xxHash CACHE INTERNAL "") | ||
|
|
||
| set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS xxHash::xxHash) |
There was a problem hiding this comment.
Only some BUILTINs have this line, but not others such as libgif, etc.
Should we remove everywhere, or add everywhere, or is hybrid intended?
builtins/nlohmann/CMakeLists.txt:set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS builtin_nlohmann_json_incl)
builtins/pcre/CMakeLists.txt:set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS PCRE)
builtins/zlib/CMakeLists.txt:set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS ZLIB::ZLIB)
builtins/xrootd/CMakeLists.txt:set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS BUILTIN_XROOTD)
builtins/openssl/CMakeLists.txt:set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS OPENSSL)
cmake/modules/SearchInstalledSoftware.cmake: set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS VDT::VDT)
CMakeLists.txt:get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
There was a problem hiding this comment.
we tried to preserve the targets, and also to trim away the code which was not necessary. What we tried to achieve is to have these 4 variables for all builtins:
XYZ_INCLUDE_DIRS
XYZ_LIBRARIES
XYZ_FOUND
XYZ_VERSION
There was a problem hiding this comment.
Thanks, but I meant specifically the line:
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS xxHash::xxHash)
the equivalent line is in the zlib builtin but not in the other builtins, so I was not sure which way to go
There was a problem hiding this comment.
It's used later for
get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
add_custom_target(move_headers ALL DEPENDS ${__allHeaders} ${__allBuiltins} gitinfotxt)
so I guess all of them should have this, right now only a couple of them have this ?
or maybe it depends on static vs shared?
thanks to dpiparo
find required dep, too
|
thanks. I propose to also add |
to check no conflicts with system library as suggested by dpiparo
No description provided.