Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
e56ef603
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e56ef603
编写于
11月 25, 2019
作者:
J
Jin Hai
提交者:
GitHub
11月 25, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #519 from ZhifengZhang-CN/0.6.0
disable untar verbose
上级
c9490401
d3812c2e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
2 deletion
+14
-2
core/CMakeLists.txt
core/CMakeLists.txt
+13
-1
core/src/index/cmake/BuildUtilsCore.cmake
core/src/index/cmake/BuildUtilsCore.cmake
+1
-1
未找到文件。
core/CMakeLists.txt
浏览文件 @
e56ef603
...
...
@@ -31,9 +31,21 @@ GET_CURRENT_TIME(BUILD_TIME)
string
(
REGEX REPLACE
"
\n
"
""
BUILD_TIME
${
BUILD_TIME
}
)
message
(
STATUS
"Build time =
${
BUILD_TIME
}
"
)
if
(
NOT DEFINED CMAKE_BUILD_TYPE
)
set
(
CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build."
)
endif
()
set
(
GIT_BRANCH_NAME_REGEX
"[0-9]+
\\
.[0-9]+
\\
.[0-9]"
)
MACRO
(
GET_GIT_BRANCH_NAME GIT_BRANCH_NAME
)
execute_process
(
COMMAND sh
"-c"
"git log --decorate | head -n 1 | sed 's/.*(
\\
(.*
\\
))/
\\
1/' | sed 's/.*
\\
(.*
\\
),.*/
\\
1/' | sed 's=[a-zA-Z]*\/==g'"
OUTPUT_VARIABLE
${
GIT_BRANCH_NAME
}
)
if
(
NOT GIT_BRANCH_NAME MATCHES
"
${
GIT_BRANCH_NAME_REGEX
}
"
)
execute_process
(
COMMAND
"git"
rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE
${
GIT_BRANCH_NAME
}
)
endif
()
if
(
NOT GIT_BRANCH_NAME MATCHES
"
${
GIT_BRANCH_NAME_REGEX
}
"
)
execute_process
(
COMMAND
"git"
symbolic-ref --short -q HEAD HEAD OUTPUT_VARIABLE
${
GIT_BRANCH_NAME
}
)
endif
()
ENDMACRO
(
GET_GIT_BRANCH_NAME
)
GET_GIT_BRANCH_NAME
(
GIT_BRANCH_NAME
)
...
...
@@ -43,7 +55,7 @@ if (NOT GIT_BRANCH_NAME STREQUAL "")
endif
()
set
(
MILVUS_VERSION
"
${
GIT_BRANCH_NAME
}
"
)
string
(
REGEX MATCH
"
[0-9]+
\\
.[0-9]+
\\
.[0-9]
"
MILVUS_VERSION
"
${
MILVUS_VERSION
}
"
)
string
(
REGEX MATCH
"
${
GIT_BRANCH_NAME_REGEX
}
"
MILVUS_VERSION
"
${
MILVUS_VERSION
}
"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Release"
)
set
(
BUILD_TYPE
"Release"
)
...
...
core/src/index/cmake/BuildUtilsCore.cmake
浏览文件 @
e56ef603
...
...
@@ -74,7 +74,7 @@ function(ExternalProject_Use_Cache project_name package_file install_path)
${
CMAKE_COMMAND
}
-E echo
"Extracting
${
package_file
}
to
${
install_path
}
"
COMMAND
${
CMAKE_COMMAND
}
-E tar xz
v
f
${
package_file
}
${
install_path
}
${
CMAKE_COMMAND
}
-E tar xzf
${
package_file
}
${
install_path
}
WORKING_DIRECTORY
${
INDEX_BINARY_DIR
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录