File add-shared-libs-to-milvus-common.patch of Package milvus

Overview Repositories Revisions Requests Users Attributes Meta

File add-shared-libs-to-milvus-common.patch of Package milvus

From b54e23f15a78f2668434c57c836287738083b6b2 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 17 Sep 2024 12:18:22 +0200
Subject: [PATCH] add shared libs to milvus common

Signed-off-by: Christian Goll <cgoll@suse.com>
---
 internal/core/src/CMakeLists.txt                    | 13 +++++++++++++
 .../milvus-storage/milvus-storage_CMakeLists.txt    |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/internal/core/src/CMakeLists.txt b/internal/core/src/CMakeLists.txt
index 6c0e831a..6ea0925b 100644
--- a/internal/core/src/CMakeLists.txt
+++ b/internal/core/src/CMakeLists.txt
@@ -69,6 +69,7 @@ add_library(milvus_core SHARED
     $<TARGET_OBJECTS:milvus-storage>
 )
 
+if(WITH_CONAN)
 set(LINK_TARGETS 
     boost_bitset_ext
     simdjson
@@ -76,6 +77,18 @@ set(LINK_TARGETS
     knowhere
     ${OpenMP_CXX_FLAGS}
     ${CONAN_LIBS})
+else()
+  find_package(Arrow REQUIRED)
+  find_package(Protobuf REQUIRED)
+  set(LINK_TARGETS 
+      boost_bitset_ext
+      simdjson
+      tantivy_binding
+      knowhere
+      protobuf::libprotobuf
+      Arrow::arrow_shared
+      ${OpenMP_CXX_FLAGS})
+endif()
 
 if(USE_OPENDAL)
     set(LINK_TARGETS ${LINK_TARGETS} opendal)
diff --git a/internal/core/thirdparty/milvus-storage/milvus-storage_CMakeLists.txt b/internal/core/thirdparty/milvus-storage/milvus-storage_CMakeLists.txt
index 2b3d09c7..a5e2cec9 100644
--- a/internal/core/thirdparty/milvus-storage/milvus-storage_CMakeLists.txt
+++ b/internal/core/thirdparty/milvus-storage/milvus-storage_CMakeLists.txt
@@ -22,6 +22,8 @@ find_package(AWSSDK REQUIRED)
 file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.cc)
 message(STATUS "SRC_FILES: ${SRC_FILES}")
 add_library(milvus-storage OBJECT ${SRC_FILES})
+target_link_library(milvus-storage
+  protobuf::libprotobuf)
 target_include_directories(milvus-storage PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/milvus-storage ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 if (WITH_UT)
-- 
2.43.0

Places

File add-shared-libs-to-milvus-common.patch of Package milvus

Places