Commit bd64dde8 authored by JinHai-CN's avatar JinHai-CN
Browse files

Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1 


Former-commit-id: b1ed286f11a7312b3ccb9ed50c25b9f2fab87be1
parents 39d71241 8266b542

core/CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ string(REGEX REPLACE "\n" "" BUILD_TIME ${BUILD_TIME}) 
message(STATUS "Build time = ${BUILD_TIME}")



MACRO (GET_GIT_BRANCH_NAME GIT_BRANCH_NAME)

    execute_process(COMMAND "git" symbolic-ref --short HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    execute_process(COMMAND "git" rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    if(GIT_BRANCH_NAME STREQUAL "")

        execute_process(COMMAND "git" symbolic-ref --short -q HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    endif()

ENDMACRO (GET_GIT_BRANCH_NAME)



GET_GIT_BRANCH_NAME(GIT_BRANCH_NAME)