use env variable to switch mem manager and fix cmake

Former-commit-id: 7928c6384045f002fd4bf4367bcf5ab9b5262ac0
This commit is contained in:
zhiru 2019-07-09 17:15:21 +08:00
parent a569f60407
commit d13b244a46
3 changed files with 3 additions and 2 deletions

2
cpp/.gitignore vendored
View File

@ -7,4 +7,4 @@ lcov_out/
base.info
output.info
output_new.info
server.info
server.info

View File

@ -209,6 +209,7 @@ install(TARGETS milvus_server DESTINATION bin)
install(FILES
${CMAKE_BINARY_DIR}/knowhere_ep-prefix/src/knowhere_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}
${CMAKE_BINARY_DIR}/knowhere_ep-prefix/src/knowhere_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}.2
${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}
${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}.3
${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}.3.2.4

@ -1 +1 @@
Subproject commit 3a052d063ff9b360529a4a120f9703f00c603437
Subproject commit c3123501d62f69f9eacaa73ee96c0daeb24620a5