Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
430d09a3
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
430d09a3
编写于
5月 30, 2019
作者:
Y
Yang Xuan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'mega/branch-1.2' into branch-1.2
Former-commit-id: 8af3d1b93944bba3c4015d278ac14756c43f804e
上级
321dda53
3896fca2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
20 deletion
+49
-20
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/cmake/ThirdPartyPackages.cmake
cpp/cmake/ThirdPartyPackages.cmake
+48
-20
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
430d09a3
...
...
@@ -16,6 +16,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-21 - Implement SDK interface part 2
-
MS-26 - cmake. Add thirdparty packages
-
MS-31 - cmake: add prometheus
-
MS-33 - cmake: add -j4 to make third party packages build faster
### Task
...
...
cpp/cmake/ThirdPartyPackages.cmake
浏览文件 @
430d09a3
...
...
@@ -152,14 +152,16 @@ if("${MAKE}" STREQUAL "")
endif
()
endif
()
# Using make -j in sub-make is fragile
# see discussion https://github.com/apache/MEGASEARCH/pull/2779
if
(
${
CMAKE_GENERATOR
}
MATCHES
"Makefiles"
)
set
(
MAKE_BUILD_ARGS
""
)
else
()
# limit the maximum number of jobs for ninja
set
(
MAKE_BUILD_ARGS
"-j4"
)
endif
()
set
(
MAKE_BUILD_ARGS
"-j4"
)
## Using make -j in sub-make is fragile
## see discussion https://github.com/apache/MEGASEARCH/pull/2779
#if(${CMAKE_GENERATOR} MATCHES "Makefiles")
# set(MAKE_BUILD_ARGS "")
#else()
# # limit the maximum number of jobs for ninja
# set(MAKE_BUILD_ARGS "-j4")
#endif()
# ----------------------------------------------------------------------
# Find pthreads
...
...
@@ -537,6 +539,9 @@ macro(build_easyloggingpp)
${
EP_LOG_OPTIONS
}
CMAKE_ARGS
${
EASYLOGGINGPP_CMAKE_ARGS
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_BYPRODUCTS
${
EASYLOGGINGPP_STATIC_LIB
}
)
...
...
@@ -577,7 +582,8 @@ macro(build_openblas)
BUILD_IN_SOURCE
1
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
${
MAKE
}
${
MAKE_BUILD_ARGS
}
INSTALL_COMMAND
${
MAKE
}
PREFIX=
${
OPENBLAS_PREFIX
}
...
...
@@ -623,6 +629,9 @@ macro(build_lapack)
${
EP_LOG_OPTIONS
}
CMAKE_ARGS
${
LAPACK_CMAKE_ARGS
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_BYPRODUCTS
${
LAPACK_STATIC_LIB
}
)
...
...
@@ -694,6 +703,9 @@ macro(build_faiss)
# ${FAISS_PREFIX}
# BUILD_COMMAND
# ${MAKE} ${MAKE_BUILD_ARGS}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_IN_SOURCE
1
# INSTALL_DIR
...
...
@@ -774,6 +786,9 @@ macro(build_gtest)
ExternalProject_Add
(
googletest_ep
URL
${
GTEST_SOURCE_URL
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_BYPRODUCTS
${
GTEST_STATIC_LIB
}
${
GTEST_MAIN_STATIC_LIB
}
...
...
@@ -936,27 +951,25 @@ macro(build_prometheus)
"
${
PROMETHEUS_PUSH_STATIC_LIB
}
"
"
${
PROMETHEUS_PULL_STATIC_LIB
}
"
)
#file(MAKE_DIRECTORY "${PROMETHEUS_PREFIX}/include")
file
(
MAKE_DIRECTORY
"
${
PROMETHEUS_PREFIX
}
/push/include"
)
add_library
(
prometheus-cpp-push STATIC IMPORTED
)
set_target_properties
(
prometheus-cpp-push
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_PUSH_STATIC_LIB
}
"
)
# INTERFACE_INCLUDE_DIRECTORIES
# "${PROMETHEUS_PREFIX}/push/include")
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_PUSH_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
PROMETHEUS_PREFIX
}
/push/include"
)
add_dependencies
(
prometheus-cpp-push prometheus_ep
)
file
(
MAKE_DIRECTORY
"
${
PROMETHEUS_PREFIX
}
/pull/include"
)
add_library
(
prometheus-cpp-pull STATIC IMPORTED
)
set_target_properties
(
prometheus-cpp-pull
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_PULL_STATIC_LIB
}
"
)
# INTERFACE_INCLUDE_DIRECTORIES
# "${PROMETHEUS_PREFIX}/pull/include")
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_PULL_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
PROMETHEUS_PREFIX
}
/pull/include"
)
add_dependencies
(
prometheus-cpp-pull prometheus_ep
)
file
(
MAKE_DIRECTORY
"
${
PROMETHEUS_PREFIX
}
/core/include"
)
add_library
(
prometheus-cpp-core STATIC IMPORTED
)
set_target_properties
(
prometheus-cpp-core
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_CORE_STATIC_LIB
}
"
)
# INTERFACE_INCLUDE_DIRECTORIES
# "${PROMETHEUS_PREFIX}/core/include")
PROPERTIES IMPORTED_LOCATION
"
${
PROMETHEUS_CORE_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
PROMETHEUS_PREFIX
}
/core/include"
)
add_dependencies
(
prometheus-cpp-core prometheus_ep
)
endmacro
()
...
...
@@ -1049,6 +1062,9 @@ macro(build_snappy)
externalproject_add
(
snappy_ep
${
EP_LOG_OPTIONS
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_IN_SOURCE
1
INSTALL_DIR
...
...
@@ -1358,6 +1374,9 @@ macro(build_thrift)
BUILD_BYPRODUCTS
"
${
THRIFT_STATIC_LIB
}
"
"
${
THRIFT_COMPILER
}
"
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
CMAKE_ARGS
${
THRIFT_CMAKE_ARGS
}
DEPENDS
...
...
@@ -1399,6 +1418,9 @@ macro(build_yamlcpp)
URL
${
YAMLCPP_SOURCE_URL
}
${
EP_LOG_OPTIONS
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_BYPRODUCTS
"
${
YAMLCPP_STATIC_LIB
}
"
CMAKE_ARGS
...
...
@@ -1446,6 +1468,9 @@ macro(build_zlib)
URL
${
ZLIB_SOURCE_URL
}
${
EP_LOG_OPTIONS
}
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
BUILD_BYPRODUCTS
"
${
ZLIB_STATIC_LIB
}
"
CMAKE_ARGS
...
...
@@ -1513,6 +1538,9 @@ macro(build_zstd)
${
ZSTD_CMAKE_ARGS
}
SOURCE_SUBDIR
"build/cmake"
BUILD_COMMAND
${
MAKE
}
${
MAKE_BUILD_ARGS
}
INSTALL_DIR
${
ZSTD_PREFIX
}
URL
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录