From 61aedb86cc87e4931bf4f6dd57ddf2107bdb85d9 Mon Sep 17 00:00:00 2001 From: groot Date: Fri, 28 Jun 2019 11:06:27 +0800 Subject: [PATCH] change default db path Former-commit-id: ed8bbeb2ca73c5d2d4e4ec8b837cb948f18362fd --- cpp/CMakeLists.txt | 7 ++++++- cpp/build.sh | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 98c493b9a9..9a5c5b2f75 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -141,7 +141,12 @@ endif(BUILD_UNIT_TEST) add_custom_target(Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean) -set(MILVUS_PATH "/tmp/milvus") + +if("${MILVUS_DB_PATHE}" STREQUAL "") + set(MILVUS_PATH "/tmp/milvus") +else() + set(MILVUS_PATH ${MILVUS_DB_PATHE}) +endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.conf) diff --git a/cpp/build.sh b/cpp/build.sh index a7ece5fee6..de9a8d3205 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -6,6 +6,7 @@ LICENSE_CHECK="OFF" INSTALL_PREFIX=$(pwd)/milvus MAKE_CLEAN="OFF" BUILD_COVERAGE="OFF" +DB_PATH="/opt/milvus" while getopts "p:t:uhlrc" arg do @@ -71,6 +72,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \ -DCMAKE_LICENSE_CHECK=${LICENSE_CHECK} \ -DBUILD_COVERAGE=${BUILD_COVERAGE} \ + -DMILVUS_DB_PATHE=${DB_PATH} \ $@ ../" echo ${CMAKE_CMD}