From 6c59f66b0dd934ed82ca6d87a56590b21daa74b9 Mon Sep 17 00:00:00 2001 From: zhiru Date: Tue, 11 Jun 2019 11:00:41 +0800 Subject: [PATCH] cmake: fix faiss dependency Former-commit-id: 4f93415c61d67a902972cfde865f2672366282b1 --- cpp/CHANGELOG.md | 1 + cpp/cmake/ThirdPartyPackages.cmake | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 34d80abbbf..0fce5d14ba 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-64 - Different table can have different index type - MS-52 - Return search score - MS-66 - Support time range query +- MS-71 - cmake: fix faiss dependency ## Task diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index f42c279a8d..af062642fa 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -716,17 +716,23 @@ macro(build_faiss) ${FAISS_STATIC_LIB}) # DEPENDS # ${faiss_dependencies}) - ExternalProject_Add_StepDependencies(faiss_ep build openblas_ep) - ExternalProject_Add_StepDependencies(faiss_ep build lapack_ep) + + ExternalProject_Add_StepDependencies(faiss_ep build openblas_ep lapack_ep) file(MAKE_DIRECTORY "${FAISS_INCLUDE_DIR}") add_library(faiss STATIC IMPORTED) set_target_properties( faiss PROPERTIES IMPORTED_LOCATION "${FAISS_STATIC_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${FAISS_INCLUDE_DIR}") + INTERFACE_INCLUDE_DIRECTORIES "${FAISS_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "openblas;lapack" ) add_dependencies(faiss faiss_ep) + #add_dependencies(faiss openblas_ep) + #add_dependencies(faiss lapack_ep) + #target_link_libraries(faiss ${OPENBLAS_PREFIX}/lib) + #target_link_libraries(faiss ${LAPACK_PREFIX}/lib) + endmacro() if(MEGASEARCH_WITH_FAISS)