mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/10.2' into 10.3

Browse source
This commit is contained in:
Alexander Barkov 2017-04-22 23:49:47 +04:00
commit 530396cef0
82 changed files with 2247 additions and 1892 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugin/aws_key_management/CMakeLists.txt
View file

@ -108,11 +108,19 @@ ELSE()
SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION ${loc})
ENDFOREACH()
# To be compatible with older cmake, we use older version of the SDK
# We increase the version for macs however, so the newest mac could built it.
IF(APPLE)
SET(GIT_TAG "1.0.100")
ELSE()
SET(GIT_TAG "1.0.8")
ENDIF()
SET(AWS_SDK_PATCH_COMMAND )
ExternalProject_Add(
aws_sdk_cpp
GIT_REPOSITORY "https://github.com/awslabs/aws-sdk-cpp.git"
GIT_TAG "1.0.8"
GIT_TAG ${GIT_TAG}
UPDATE_COMMAND ""
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp"
${byproducts}