Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
b33165f6
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,发现更多精彩内容 >>
提交
b33165f6
编写于
6月 20, 2019
作者:
Z
zhiru
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix AWS build issue
Former-commit-id: 5a7e5b182441a5780d95914ee40b138ea25abac2
上级
e263ffee
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
16 deletion
+33
-16
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/cmake/ThirdPartyPackages.cmake
cpp/cmake/ThirdPartyPackages.cmake
+28
-9
cpp/unittest/storage/CMakeLists.txt
cpp/unittest/storage/CMakeLists.txt
+4
-7
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
b33165f6
...
...
@@ -51,6 +51,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-34 - Fix prometheus-cpp thirdparty
-
MS-67 - Fix license check bug
-
MS-76 - Fix pipeline crash bug
-
MS-100 - cmake: fix AWS build issue
## Improvement
...
...
cpp/cmake/ThirdPartyPackages.cmake
浏览文件 @
b33165f6
...
...
@@ -1762,7 +1762,10 @@ macro(build_aws)
-DENABLE_UNITY_BUILD=on
-DNO_ENCRYPTION=off
)
set
(
AWS_STATIC_LIB
"
${
AWS_PREFIX
}
/lib/libs3.a"
)
set
(
AWS_CPP_SDK_CORE_STATIC_LIB
"
${
AWS_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
aws-cpp-sdk-core
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
set
(
AWS_CPP_SDK_S3_STATIC_LIB
"
${
AWS_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
aws-cpp-sdk-s3
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
# Only pass our C flags on Unix as on MSVC it leads to a
# "incompatible command-line options" error
set
(
AWS_CMAKE_ARGS
...
...
@@ -1788,24 +1791,40 @@ macro(build_aws)
URL
${
AWS_SOURCE_URL
}
BUILD_BYPRODUCTS
"
${
AWS_STATIC_LIB
}
"
)
"
${
AWS_CPP_SDK_S3_STATIC_LIB
}
"
"
${
AWS_CPP_SDK_CORE_STATIC_LIB
}
"
)
file
(
MAKE_DIRECTORY
"
${
AWS_PREFIX
}
/include"
)
add_library
(
aws STATIC IMPORTED
)
set_target_properties
(
aws
PROPERTIES IMPORTED_LOCATION
"
${
AWS_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
AWS_PREFIX
}
/include"
)
add_library
(
aws-cpp-sdk-s3 STATIC IMPORTED
)
set_target_properties
(
aws-cpp-sdk-s3
PROPERTIES
IMPORTED_LOCATION
"
${
AWS_CPP_SDK_S3_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
AWS_PREFIX
}
/include"
INTERFACE_LINK_LIBRARIES
"
${
AWS_PREFIX
}
/lib/libaws-c-event-stream.a;
${
AWS_PREFIX
}
/lib/libaws-checksums.a;
${
AWS_PREFIX
}
/lib/libaws-c-common.a"
)
add_library
(
aws-cpp-sdk-core STATIC IMPORTED
)
set_target_properties
(
aws-cpp-sdk-core
PROPERTIES IMPORTED_LOCATION
"
${
AWS_CPP_SDK_CORE_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
AWS_PREFIX
}
/include"
INTERFACE_LINK_LIBRARIES
"
${
AWS_PREFIX
}
/lib/libaws-c-event-stream.a;
${
AWS_PREFIX
}
/lib/libaws-checksums.a;
${
AWS_PREFIX
}
/lib/libaws-c-common.a"
)
add_dependencies
(
aws-cpp-sdk-s3 aws_ep
)
add_dependencies
(
aws-cpp-sdk-core aws_ep
)
add_dependencies
(
aws aws_ep
)
endmacro
()
if
(
MILVUS_WITH_AWS
)
resolve_dependency
(
AWS
)
# TODO: Don't use global includes but rather target_include_directories
get_target_property
(
AWS_INCLUDE_DIR aws INTERFACE_INCLUDE_DIRECTORIES
)
link_directories
(
SYSTEM
${
AWS_PREFIX
}
/lib
)
include_directories
(
SYSTEM
${
AWS_INCLUDE_DIR
}
)
get_target_property
(
AWS_CPP_SDK_S3_INCLUDE_DIR aws-cpp-sdk-s3 INTERFACE_INCLUDE_DIRECTORIES
)
include_directories
(
SYSTEM
${
AWS_CPP_SDK_S3_INCLUDE_DIR
}
)
get_target_property
(
AWS_CPP_SDK_CORE_INCLUDE_DIR aws-cpp-sdk-core INTERFACE_INCLUDE_DIRECTORIES
)
include_directories
(
SYSTEM
${
AWS_CPP_SDK_CORE_INCLUDE_DIR
}
)
endif
()
cpp/unittest/storage/CMakeLists.txt
浏览文件 @
b33165f6
...
...
@@ -6,8 +6,8 @@
aux_source_directory
(
${
MILVUS_ENGINE_SRC
}
/storage/s3 s3_client_src
)
# Make sure that your call to link_directories takes place before your call to the relevant add_executable.
include_directories
(
/usr/local/cuda/include
)
link_directories
(
"
/usr/local/cuda
/lib64"
)
include_directories
(
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/include"
)
link_directories
(
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib64"
)
set
(
s3_client_test_src
${
unittest_srcs
}
...
...
@@ -23,11 +23,8 @@ add_executable(s3_test
set
(
s3_client_libs
stdc++
libaws-cpp-sdk-s3.a
libaws-cpp-sdk-core.a
libaws-c-event-stream.a
libaws-checksums.a
libaws-c-common.a
aws-cpp-sdk-s3
aws-cpp-sdk-core
boost_filesystem
)
target_link_libraries
(
s3_test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录