[builtins] download instead of bundle xxhash and bump from 0.8.0 to 0.8.3#21806
Open
ferdymercury wants to merge 1 commit intoroot-project:masterfrom
Open
[builtins] download instead of bundle xxhash and bump from 0.8.0 to 0.8.3#21806ferdymercury wants to merge 1 commit intoroot-project:masterfrom
ferdymercury wants to merge 1 commit intoroot-project:masterfrom
Conversation
ferdymercury
changed the title
Test Results 16 files 16 suites 2d 3h 36m 54s ⏱️ Results for commit 29d679c. ♻️ This comment has been updated with latest results. |
add CMakeLists patch rm bundled copy
ferdymercury
changed the title
ferdymercury
commented
Apr 7, 2026
| ExternalProject_Add( | ||
| BUILTIN_XXHASH | ||
| PREFIX ${ROOT_XXHASH_PREFIX} | ||
| URL https://github.com/Cyan4973/xxHash/archive/refs/tags/v${ROOT_XXHASH_VERSION}.tar.gz |
Collaborator
Author
There was a problem hiding this comment.
potentially use LCG instead?
| 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) |
Collaborator
Author
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)
ferdymercury
commented
Apr 7, 2026
| @@ -1,35 +1,57 @@ | |||
| # Copyright (C) 1995-2021, Rene Brun and Fons Rademakers. | |||
| # All rights reserved. | |||
| # Copyright (C) 1995-2026, Rene Brun and Fons Rademakers. All rights reserved. | |||
Collaborator
Author
There was a problem hiding this comment.
Question, should we add sth like:
ROOT_FIND_REQUIRED_DEP(xxhash builtin_xxhash)
in cmake/modules/SearchInstalledSoftware.cmake ?
ferdymercury
commented
Apr 7, 2026
| set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS xxHash::xxHash) | ||
| # For the licensing terms see $ROOTSYS/LICENSE. For the list of contributors see | ||
| # $ROOTSYS/README/CREDITS. | ||
|
|
Collaborator
Author
There was a problem hiding this comment.
I guess we do not want this #21689 for xxhash, right?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.