From 89c18bb3b3e7315d21ee34dbe208098884610536 Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 18:49:09 +0200 Subject: [PATCH 1/8] fix: error: 'numeric_limits' is not a member of 'std' --- src/diskhash_iterator.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diskhash_iterator.hpp b/src/diskhash_iterator.hpp index c5555f8..45f6f11 100644 --- a/src/diskhash_iterator.hpp +++ b/src/diskhash_iterator.hpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace dht { From b32a1a6739fba2cb04c061c6cf0283963795de47 Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 18:49:52 +0200 Subject: [PATCH 2/8] fix: warning: control reaches end of non-void function --- src/diskhash_iterator.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diskhash_iterator.hpp b/src/diskhash_iterator.hpp index 45f6f11..7b1e16a 100644 --- a/src/diskhash_iterator.hpp +++ b/src/diskhash_iterator.hpp @@ -115,6 +115,7 @@ struct DiskHash::iterator { } // There is no other available return for dht_indexed_lookup (). assert (false); + return 0; } }; From 9b02f8e77d28972d102026d747cf1d78d64891bf Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 19:08:00 +0200 Subject: [PATCH 3/8] fix: No rule to make target 'install'. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2838d20..2f34bc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,9 @@ include(setup) include_directories(${CMAKE_SOURCE_DIR}/src) add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) +#install(TARGETS diskhash DESTINATION lib) +install(TARGETS diskhash DESTINATION lib/diskhash) + if(DISKHASH_TESTS) include_directories(${CMAKE_SOURCE_DIR}/unittests) From 01ef8098ee399c8acaa21567a00457d8caee516c Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 19:24:00 +0200 Subject: [PATCH 4/8] fix cmake options --- CMakeLists.txt | 8 +++++++- cmake-modules/setup.cmake | 10 ---------- 2 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 cmake-modules/setup.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f34bc2..f3e9037 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,13 @@ project(${PROJECT_NAME}) option(WITH_ASAN ON) option(DISKHASH_TESTS ON) -include(setup) +set(CXX_FLAGS + CMAKE_CXX_FLAGS + CMAKE_CXX_FLAGS_DEBUG + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_RELWITHDEBINFO +) include_directories(${CMAKE_SOURCE_DIR}/src) add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) diff --git a/cmake-modules/setup.cmake b/cmake-modules/setup.cmake deleted file mode 100644 index df02f34..0000000 --- a/cmake-modules/setup.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(CXX_FLAGS - CMAKE_CXX_FLAGS - CMAKE_CXX_FLAGS_DEBUG - CMAKE_CXX_FLAGS_MINSIZEREL - CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_RELWITHDEBINFO -) - -set(WITH_ASAN ON) -set(DISKHASH_TESTS ON) From 65257ab413a63d1ff944570c5ff7427f47f226fa Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 19:34:37 +0200 Subject: [PATCH 5/8] install diskhash.hpp --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3e9037..d36e041 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,9 @@ add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) #install(TARGETS diskhash DESTINATION lib) install(TARGETS diskhash DESTINATION lib/diskhash) +install(FILES src/diskhash.hpp + DESTINATION include) + if(DISKHASH_TESTS) include_directories(${CMAKE_SOURCE_DIR}/unittests) From 1d5dfa1804febfb1b510b79bbda0c6d06bf05ddc Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 20:25:37 +0200 Subject: [PATCH 6/8] install diskhashConfig.cmake --- CMakeLists.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d36e041..e2601f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,11 +24,21 @@ set(CXX_FLAGS include_directories(${CMAKE_SOURCE_DIR}/src) add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) -#install(TARGETS diskhash DESTINATION lib) -install(TARGETS diskhash DESTINATION lib/diskhash) +set_target_properties(diskhash PROPERTIES PUBLIC_HEADER src/diskhash.hpp) + +install(TARGETS diskhash + EXPORT diskhashTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include + PUBLIC_HEADER DESTINATION include +) -install(FILES src/diskhash.hpp - DESTINATION include) +install(EXPORT diskhashTargets + FILE diskhashConfig.cmake + DESTINATION lib/cmake/diskhash +) if(DISKHASH_TESTS) include_directories(${CMAKE_SOURCE_DIR}/unittests) From 5d2bbc0ca247fbc3a931d2bbd317ad722ae7706d Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 20:40:10 +0200 Subject: [PATCH 7/8] fixup: also install src/diskhash.h --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2601f0..496c96f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,9 @@ set(CXX_FLAGS include_directories(${CMAKE_SOURCE_DIR}/src) add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) -set_target_properties(diskhash PROPERTIES PUBLIC_HEADER src/diskhash.hpp) +set_target_properties(diskhash PROPERTIES PUBLIC_HEADER + "src/diskhash.h;src/diskhash.hpp" +) install(TARGETS diskhash EXPORT diskhashTargets From eba18323495ea22b6560be0dc7c001250c176892 Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Wed, 17 Jul 2024 20:48:20 +0200 Subject: [PATCH 8/8] fixup: install all header files --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 496c96f..b0d50cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,9 +24,8 @@ set(CXX_FLAGS include_directories(${CMAKE_SOURCE_DIR}/src) add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c) -set_target_properties(diskhash PROPERTIES PUBLIC_HEADER - "src/diskhash.h;src/diskhash.hpp" -) +file(GLOB HDR_FILES ${CMAKE_SOURCE_DIR}/src/*.h*) +set_target_properties(diskhash PROPERTIES PUBLIC_HEADER "${HDR_FILES}") install(TARGETS diskhash EXPORT diskhashTargets @@ -34,7 +33,7 @@ install(TARGETS diskhash ARCHIVE DESTINATION lib RUNTIME DESTINATION bin INCLUDES DESTINATION include - PUBLIC_HEADER DESTINATION include + PUBLIC_HEADER DESTINATION include/diskhash ) install(EXPORT diskhashTargets