Skip to content

Commit e1a3579

Browse files
authored
[xxhash] simplify
Co-authored-by: ferdymercury <ferdymercury@users.noreply.github.com>
1 parent 83118a0 commit e1a3579

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

builtins/xxhash/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ ExternalProject_Add(
4646

4747
file(MAKE_DIRECTORY ${ROOT_XXHASH_PREFIX}/include)
4848
add_library(xxHash::xxHash IMPORTED STATIC GLOBAL)
49+
add_dependencies(xxHash::xxHash BUILTIN_XXHASH)
4950
set_target_properties(xxHash::xxHash PROPERTIES
5051
IMPORTED_LOCATION ${ROOT_XXHASH_LIBRARY}
5152
INTERFACE_INCLUDE_DIRECTORIES ${ROOT_XXHASH_PREFIX}/include)

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ endif()
313313
#---Check for xxHash-----------------------------------------------------------------
314314
ROOT_FIND_REQUIRED_DEP(xxHash builtin_xxhash)
315315
if(builtin_xxhash)
316+
list(APPEND ROOT_BUILTINS xxHash)
316317
add_subdirectory(builtins/xxhash)
317318
endif()
318319

core/lz4/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ find_package(LZ4 REQUIRED)
99
if(builtin_lz4)
1010
add_dependencies(Core BUILTIN_LZ4)
1111
endif()
12-
if(builtin_xxhash)
13-
add_dependencies(Core BUILTIN_XXHASH)
14-
endif()
1512

1613
target_sources(Core PRIVATE src/ZipLZ4.cxx)
1714
target_link_libraries(Core PRIVATE xxHash::xxHash LZ4::LZ4)

0 commit comments

Comments
 (0)