diff --git a/conan.lock b/conan.lock index 1a9bf81..9aa5830 100644 --- a/conan.lock +++ b/conan.lock @@ -15,7 +15,7 @@ "libpfm4/4.13.0", "libunwind/1.8.1", "liburing/2.11", - "llfs/0.46.0", + "llfs/0.47.1", "openssl/3.6.0", "pcg-cpp/cci.20220409", "protobuf/3.21.12", diff --git a/conanfile.py b/conanfile.py index 74989f2..d90205b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -52,8 +52,8 @@ class TurtleKvRecipe(ConanFile): default_options = { "with_keyvcr": False, - "use_bloom_filter": False, - "use_quotient_filter": True, + "use_bloom_filter": True, + "use_quotient_filter": False, "enable_leaf_filters": True, "enable_metrics": True, "profile_updates": True, @@ -92,7 +92,7 @@ def requirements(self): self.requires("batteries/[>=0.71.1 <1]", **VISIBLE, **OVERRIDE) self.requires("boost/1.88.0", **VISIBLE, **OVERRIDE) self.requires("glog/0.7.1", **VISIBLE) - self.requires("llfs/[>=0.46.0 <1]", **VISIBLE) + self.requires("llfs/[>=0.47.0 <1]", **VISIBLE) self.requires("pcg-cpp/cci.20220409", **VISIBLE) self.requires("yaml-cpp/[>=0.9.0 <1]") self.requires("zlib/1.3.1", **OVERRIDE) @@ -144,6 +144,19 @@ def package(self): def package_info(self): self.cor.package_info_lib_default(self) + def _set_flags(name, value): + if value: + self.cpp_info.cxxflags += [f'-DTURTLE_KV_{name}=1'] + else: + self.cpp_info.cxxflags += [f'-DTURTLE_KV_{name}=0'] + + _set_flags('USE_BLOOM_FILTER', self.options.use_bloom_filter) + _set_flags('USE_QUOTIENT_FILTER', self.options.use_quotient_filter) + _set_flags('ENABLE_LEAF_FILTERS', self.options.enable_leaf_filters) + _set_flags('ENABLE_METRICS', self.options.enable_metrics) + _set_flags('PROFILE_UPDATES', self.options.profile_updates) + _set_flags('PROFILE_QUERIES', self.options.profile_queries) + def package_id(self): self.cor.package_id_lib_default(self) diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 3d3c49c..4d64b62 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -5,4 +5,4 @@ find_package(turtle_kv CONFIG REQUIRED) add_executable(example src/example.cpp) -target_link_libraries(example turtle_kv::turtle_kv) +target_link_libraries(example batteries::batteries turtle_kv::turtle_kv) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index d7826c3..1f311af 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -12,7 +12,7 @@ class turtle_kvTestConan(ConanFile): def requirements(self): self.requires(self.tested_reference_str) - self.requires("batteries/[>=0.71.1 <1]", visible=True, force=True) + self.requires("batteries/[>=0.71.1 <1]", force=True) def build(self): cmake = CMake(self)