Include essentials library using cmake

jermp · Feb 16, 2024 · 12e1f83 · 12e1f83
1 parent bc3bf35
commit 12e1f83
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,6 +47,9 @@ if(NOT TARGET PTHASH)
       target_compile_options(PTHASH INTERFACE -fsanitize=address -fno-omit-frame-pointer)
     endif()
   endif()
+
+  add_subdirectory(external/essentials)
+  target_link_libraries(PTHASH INTERFACE ESSENTIALS)
 endif()
 
 # Only add benchmarks and tests when compiling PTHash itself, not when added as a dependency

diff --git a/external/essentials b/external/essentials
diff --git a/include/builders/search.hpp b/include/builders/search.hpp
@@ -4,7 +4,7 @@
 #include <sstream>  // for stringbuf
 #include <atomic>   // for std::atomic
 #include <vector>
-#include "../../external/essentials/include/essentials.hpp"
+#include <essentials.hpp>
 
 #include "util.hpp"
 #include "../encoders/bit_vector.hpp"

diff --git a/include/encoders/bit_vector.hpp b/include/encoders/bit_vector.hpp
@@ -5,7 +5,7 @@
 
 #include "util.hpp"
 
-#include "../../external/essentials/include/essentials.hpp"
+#include <essentials.hpp>
 
 namespace pthash {
 

diff --git a/include/encoders/compact_vector.hpp b/include/encoders/compact_vector.hpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <cmath>
 
-#include "../../external/essentials/include/essentials.hpp"
+#include <essentials.hpp>
 
 namespace pthash {
 

diff --git a/include/utils/util.hpp b/include/utils/util.hpp
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <string>
 
-#include "../../external/essentials/include/essentials.hpp"
+#include <essentials.hpp>
 #include "../../external/fastmod/fastmod.h"
 
 #define PTHASH_LIKELY(expr) __builtin_expect((bool)(expr), true)

diff --git a/src/util.hpp b/src/util.hpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "../include/utils/util.hpp"
-#include "../external/essentials/include/essentials.hpp"
+#include <essentials.hpp>
 
 namespace pthash {
+11 −0		CMakeLists.txt
+11 −7		README.md
+22 −12		include/essentials.hpp
+2 −2		test/CMakeLists.txt