From 0c3eb13fa0720fe09b55abf8c2749c5dafeb585b Mon Sep 17 00:00:00 2001 From: Dnomd343 Date: Sun, 31 Mar 2024 19:18:18 +0800 Subject: [PATCH] build: update hash library --- CMakeLists.txt | 2 +- src/core_test/CMakeLists.txt | 2 +- third_party/ThirdParty.cmake | 6 ++---- third_party/md5sum | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 069d546..681402d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (NOT CMAKE_BUILD_TYPE) endif() add_compile_options(-Wall -Wextra) -add_compile_options(-flto) # TODO: enabled by LTO option +add_compile_options(-flto=auto) # TODO: enabled by LTO option get_filename_component(KLOTSKI_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} ABSOLUTE) diff --git a/src/core_test/CMakeLists.txt b/src/core_test/CMakeLists.txt index e4483e9..2221c2c 100644 --- a/src/core_test/CMakeLists.txt +++ b/src/core_test/CMakeLists.txt @@ -4,7 +4,7 @@ project(core-test LANGUAGES CXX) set(CMAKE_CXX_STANDARD 23) set(KLOTSKI_TEST_DEPS klotski klotski_core - GTest::gtest_main bs::thread_pool md5sum xxHash::xxhash) + GTest::gtest_main bs::thread_pool md5sum::md5 xxHash::xxh3) # ------------------------------------------------------------------------------------ # diff --git a/third_party/ThirdParty.cmake b/third_party/ThirdParty.cmake index 7079ca5..5571909 100644 --- a/third_party/ThirdParty.cmake +++ b/third_party/ThirdParty.cmake @@ -26,9 +26,7 @@ if (KLOTSKI_ENABLE_TESTING) add_subdirectory(${KLOTSKI_THIRD_PARTY}/googletest EXCLUDE_FROM_ALL) # xxHash implementation - set(BUILD_SHARED_LIBS OFF) - set(XXHASH_BUILD_XXHSUM OFF) - set(XXHASH_BUILD_ENABLE_INLINE_API ON) - add_subdirectory(${KLOTSKI_THIRD_PARTY}/xxHash/cmake_unofficial EXCLUDE_FROM_ALL) + add_library(xxhash INTERFACE) target_include_directories(xxhash INTERFACE ${KLOTSKI_THIRD_PARTY}/xxHash) + add_library(xxHash::xxh3 ALIAS xxhash) endif() diff --git a/third_party/md5sum b/third_party/md5sum index 1b0c39a..a0ff4e3 160000 --- a/third_party/md5sum +++ b/third_party/md5sum @@ -1 +1 @@ -Subproject commit 1b0c39ad37ec147640e0bbd4a22c7ce8f09d915b +Subproject commit a0ff4e39f9e2f49a856248fd7eb504ca7857d2bb