Skip to content

Commit e3f426b

Browse files
authored
Merge pull request #16 from BlazingDB/feature/update-aws
upgraded version of aws
2 parents 5f53791 + c5d176d commit e3f426b

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

cmake/ConfigureAWSSDK.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ macro(NORMALIZE_AWS_MODULES_FOR_EXTERNALPROJECT_ADD)
2727
endmacro()
2828

2929
macro(CONFIGURE_AWS_SDK_CPP_EXTERNAL_PROJECT)
30+
message("configuring external project")
3031
# NOTE percy c.gonzales if you want to pass other RAL CMAKE_CXX_FLAGS into this dependency add it by harcoding
3132
set(AWS_SDK_CPP_CMAKE_ARGS " -DBUILD_OPENSSL=OFF"
3233
" -DBUILD_CURL=OFF"
@@ -77,6 +78,24 @@ macro(CONFIGURE_AWS_SDK_CPP_EXTERNAL_PROJECT)
7778
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/aws-sdk-cpp-download/
7879
)
7980

81+
file(
82+
COPY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-c-common/cmake/shared/
83+
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-c-common/cmake/static/
84+
FILES_MATCHING PATTERN "*.cmake"
85+
)
86+
87+
file(
88+
COPY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-checksums/cmake/shared/
89+
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-checksums/cmake/static/
90+
FILES_MATCHING PATTERN "*.cmake"
91+
)
92+
93+
file(
94+
COPY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-c-event-stream/cmake/shared/
95+
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/thirdparty/aws-sdk-cpp-install/lib/aws-c-event-stream/cmake/static/
96+
FILES_MATCHING PATTERN "*.cmake"
97+
)
98+
8099
execute_process(
81100
COMMAND ${CMAKE_COMMAND} --build . -- -j8
82101
RESULT_VARIABLE result
@@ -131,6 +150,7 @@ set(aws-sdk-cpp_DIR ${AWS_SDK_CPP_ROOT})
131150
message(STATUS "aws-sdk-cpp_DIR: " ${aws-sdk-cpp_DIR})
132151

133152
# NOTE DO NOT CHANGE DE ORDER!
153+
find_package(aws-c-common REQUIRED)
134154
find_package(aws-cpp-sdk-core REQUIRED)
135155
find_package(aws-cpp-sdk-s3 REQUIRED)
136156
find_package(aws-cpp-sdk-kms REQUIRED)

cmake/DefineVersions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ print_line()
132132
define_default_git_package(
133133
"AWS_SDK_CPP"
134134
"https://github.com/aws/aws-sdk-cpp.git"
135-
"864eb0bca8b48427f94850b7a8311ef0ae0f433b"
135+
"c60299701915c781ebb57c3213b8bdad854a885f"
136136
"Release"
137137
)
138138

0 commit comments

Comments
 (0)