From 2ac53c89e9234b11027f3f71fafa1b9e9c5a19f7 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Tue, 29 Mar 2022 00:53:27 +0800 Subject: [PATCH] Revert #16242 (#16247) Signed-off-by: yudong.cai --- internal/core/CMakeLists.txt | 1 - internal/core/thirdparty/knowhere/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index c4998d0f38..31773cedf8 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -97,7 +97,6 @@ set( MILVUS_THIRDPARTY_SRC ${PROJECT_SOURCE_DIR}/thirdparty ) # This will set RPATH to all excutable TARGET # self-installed dynamic libraries will be correctly linked by excutable set( CMAKE_INSTALL_RPATH "/usr/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) -set( CMAKE_INSTALL_RPATH "/usr/lib64" "${CMAKE_INSTALL_PREFIX}/lib64" ) set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) # **************************** Dependencies **************************** diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt index 5b6dfd46cf..38119f34f7 100644 --- a/internal/core/thirdparty/knowhere/CMakeLists.txt +++ b/internal/core/thirdparty/knowhere/CMakeLists.txt @@ -61,8 +61,8 @@ macro(build_knowhere) set_target_properties( knowhere PROPERTIES IMPORTED_GLOBAL TRUE - IMPORTED_LOCATION ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}knowhere${CMAKE_SHARED_LIBRARY_SUFFIX} - IMPORTED_IMPLIB ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}knowhere${CMAKE_SHARED_LIBRARY_SUFFIX}.so + IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}knowhere${CMAKE_SHARED_LIBRARY_SUFFIX} + IMPORTED_IMPLIB ${INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}knowhere${CMAKE_SHARED_LIBRARY_SUFFIX}.a INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/${CMAKE_INSTALL_INCLUDEDIR}) add_dependencies(knowhere knowhere_ep)