admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mem-0.3.1' into 'branch-0.3.1'

Browse Source 
MS-190: use env variable to switch mem manager and fix cmake

See merge request megasearch/milvus!180

Former-commit-id: a839cb38ff916da6b197c40185457e7537549a17
This commit is contained in:
jinhai 2019-07-10 13:11:07 +08:00
commit 59cf5d8e65
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/cmake/ThirdPartyPackages.cmake
View File

@ -534,7 +534,7 @@ if(MILVUS_BOOST_VENDORED)
""
${EP_LOG_OPTIONS})
set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
set(Boost_INCLUDE_DIRS "${Boost_INCLUDE_DIR}")
add_dependencies(boost_system_static boost_ep)
add_dependencies(boost_filesystem_static boost_ep)
add_dependencies(boost_serialization_static boost_ep)

4
cpp/unittest/db/CMakeLists.txt
View File

@ -24,6 +24,8 @@ link_directories("/usr/local/cuda/lib64")
include_directories(/usr/include/mysql)
#add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
set(db_test_src
#${unittest_srcs}
${config_files}
@ -59,6 +61,6 @@ set(knowhere_libs
cublas
)
target_link_libraries(db_test ${db_libs} ${unittest_libs} ${knowhere_libs})
target_link_libraries(db_test ${knowhere_libs} ${db_libs} ${unittest_libs})
install(TARGETS db_test DESTINATION bin)