diff --git a/CHANGELOG.md b/CHANGELOG.md index 647a605206595bd363c15a25303775bf622f264f..a25db56645a2dd0faff24e8724bf98a5ed4c4496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-648 - Improve unittest - MS-655 - Upgrade SPTAG - \#42 - Put union of index_build_device and search resources to gpu_pool +- \#67 - Avoid linking targets multiple times in cmake ## Feature - MS-614 - Preload table at startup diff --git a/core/build.sh b/core/build.sh index cd6f65201ba64bd8d2effc761d6c394efd6d7b7e..a662fe497a2467db916b8fa9f99cc5fa42d19198 100755 --- a/core/build.sh +++ b/core/build.sh @@ -93,7 +93,7 @@ cd ${BUILD_OUTPUT_DIR} # remove make cache since build.sh -l use default variables # force update the variables each time -make rebuild_cache +make rebuild_cache > /dev/null 2>&1 CMAKE_CMD="cmake \ -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \ @@ -139,13 +139,12 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then # fi # echo "clang-tidy check passed!" else - # compile and build - make -j 4 || exit 1 # strip binary symbol if [[ ${BUILD_TYPE} != "Debug" ]]; then strip src/milvus_server fi - make install || exit 1 + # compile and build + make -j 8 install || exit 1 fi \ No newline at end of file diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake index 99f52dc2843f5f16e40cd183baac5f729067974e..7e9bb0b671585cb809671e6272b393852d4a33d4 100644 --- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake +++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake @@ -331,10 +331,9 @@ macro(build_arrow) CMAKE_ARGS ${ARROW_CMAKE_ARGS} BUILD_COMMAND - ${MAKE} - ${MAKE_BUILD_ARGS} + "" INSTALL_COMMAND - ${MAKE} install + ${MAKE} ${MAKE_BUILD_ARGS} install BUILD_BYPRODUCTS "${ARROW_STATIC_LIB}" ) @@ -365,10 +364,9 @@ macro(build_arrow) CMAKE_ARGS ${ARROW_CMAKE_ARGS} BUILD_COMMAND - ${MAKE} - ${MAKE_BUILD_ARGS} + "" INSTALL_COMMAND - ${MAKE} install + ${MAKE} ${MAKE_BUILD_ARGS} install BUILD_BYPRODUCTS "${ARROW_STATIC_LIB}" )