Skip to content

Commit e0473b6

Browse files
fix: update storage lib (#156)
Signed-off-by: shaoting-huang <[email protected]>
1 parent 96d4408 commit e0473b6

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

cpp/CMakeLists.txt

+19-7
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,26 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1212
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
1313
include(GNUInstallDirs)
1414

15-
1615
if (WITH_OPENDAL)
1716
add_compile_definitions(MILVUS_OPENDAL)
1817
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1918
include(libopendal)
2019
endif()
2120

22-
#find_package(Azure REQUIRED)
2321
find_package(Boost REQUIRED)
2422
find_package(Arrow REQUIRED)
2523
find_package(protobuf REQUIRED)
2624
find_package(glog REQUIRED)
27-
#find_package(AWSSDK REQUIRED)
2825

2926
file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.cc)
30-
add_library(milvus-storage ${SRC_FILES})
31-
target_include_directories(milvus-storage PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/milvus-storage ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/test/include)
27+
28+
add_library(milvus-storage SHARED ${SRC_FILES})
29+
target_include_directories(milvus-storage PUBLIC
30+
${CMAKE_CURRENT_SOURCE_DIR}/include/milvus-storage
31+
${CMAKE_CURRENT_SOURCE_DIR}/src
32+
${CMAKE_CURRENT_SOURCE_DIR}/test/include
33+
)
34+
3235
set(LINK_LIBS
3336
arrow::arrow
3437
Boost::boost
@@ -45,6 +48,11 @@ endif()
4548

4649
target_link_libraries(milvus-storage PUBLIC ${LINK_LIBS})
4750

51+
set_target_properties(milvus-storage PROPERTIES
52+
INSTALL_RPATH "$ORIGIN/../lib"
53+
BUILD_WITH_INSTALL_RPATH TRUE
54+
)
55+
4856
if (WITH_UT)
4957
enable_testing()
5058
add_subdirectory(test)
@@ -55,5 +63,9 @@ if (WITH_BENCHMARK)
5563
endif()
5664

5765
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/milvus-storage.pc.in "${CMAKE_CURRENT_BINARY_DIR}/milvus-storage.pc" @ONLY)
58-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/milvus-storage.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
59-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmilvus-storage.dylib" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
66+
67+
install(TARGETS milvus-storage
68+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
69+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
70+
)
71+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/milvus-storage.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")

0 commit comments

Comments
 (0)