diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-20 13:39:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-20 13:39:02 +0000 |
| commit | 8bbeac01710f7218698c93bbead69561f5cbcad2 (patch) | |
| tree | 1adcca038799d95dd3f092c454509ae1c2d06e4c | |
| parent | 9a91d743bbf53282cc05d85949acec586bc1a6f5 (diff) | |
| download | mariadb-git-8bbeac01710f7218698c93bbead69561f5cbcad2.tar.gz | |
Fix AWS SDK build error on some buildbot builders.
Use older version of the SDK generally, because the newer ones break
with older cmake.
On Macs, use newer version, to fix mac specific the build error.
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 57e7423fb68..2202efe9e41 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -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.100" + GIT_TAG ${GIT_TAG} UPDATE_COMMAND "" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp" ${byproducts} |