fix: integration build break (#165)

Signed-off-by: Ted Xu <[email protected]>
milvus-io · Jan 15, 2025 · 9e53927 · 9e53927
1 parent cd5091f
commit 9e53927
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -5,7 +5,7 @@ project(milvus-storage VERSION 0.1.0)
 option(WITH_UT "Build the testing tree." ON)
 option(WITH_ASAN "Build with address sanitizer." OFF)
 option(WITH_OPENDAL "Build with opendal." OFF)
-option(WITH_BENCHMARK "Build with micro benchmark." ON)
+option(WITH_BENCHMARK "Build with micro benchmark." OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

diff --git a/cpp/Makefile b/cpp/Makefile
@@ -11,6 +11,10 @@ build:
 	conan build .. && \
 	conan install .. --install-folder . -g make
 
+package: build
+	mkdir -p build && cd build && \
+	conan export .. milvus/testing
+
 debug:
 	mkdir -p build && cd build && \
 	conan install .. --build=missing -s build_type=Debug && \

diff --git a/cpp/conanfile.py b/cpp/conanfile.py
@@ -165,20 +165,20 @@ def package_info(self):
         self.cpp_info.set_property("cmake_target_name", "storage::storage")
         self.cpp_info.set_property("pkg_config_name", "libstorage")
 
-        self.cpp_info.components["libstorage"].libs = ["storage"]
+        self.cpp_info.components["libstorage"].libs = ["milvus-storage"]
 
-        self.cpp_info.components["libstorage"].requires = [
-            "boost::uuid",
-            "boost::algorithm",
-        ]
+        # self.cpp_info.components["libstorage"].requires = [
+        #     "boost::uuid",
+        #     "boost::algorithm",
+        # ]
         if self.options.with_ut:
             self.cpp_info.components["libstorage"].requires.append("gtest::gtest")
 
         self.cpp_info.filenames["cmake_find_package"] = "storage"
         self.cpp_info.filenames["cmake_find_package_multi"] = "storage"
         self.cpp_info.names["cmake_find_package"] = "storage"
         self.cpp_info.names["cmake_find_package_multi"] = "storage"
-        self.cpp_info.names["pkg_config"] = "libstorage"
+        self.cpp_info.names["pkg_config"] = "libmilvus-storage"
         self.cpp_info.components["libstorage"].names["cmake_find_package"] = "storage"
         self.cpp_info.components["libstorage"].names[
             "cmake_find_package_multi"