-
Notifications
You must be signed in to change notification settings - Fork 181
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Update the AWS SDK to version 1.11.160. (#4214)"
This reverts commit c524631.
- Loading branch information
1 parent
f6dd42e
commit 6ebc1e5
Showing
55 changed files
with
1,725 additions
and
1,957 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt | ||
| index b4cf1be2..64f10d43 100644 | ||
| --- a/third-party/CMakeLists.txt | ||
| +++ b/third-party/CMakeLists.txt | ||
| @@ -15,7 +15,7 @@ set(AWS_DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies buil | ||
| set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.") | ||
|
|
||
| set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git") | ||
| -set(AWS_C_COMMON_TAG "v0.4.42") | ||
| +set(AWS_C_COMMON_TAG "v0.6.2") | ||
| include(BuildAwsCCommon) | ||
|
|
||
| set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums.git") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake | ||
| index 83eac0b3b4..c1bf32066d 100644 | ||
| --- a/cmake/AWSSDKConfig.cmake | ||
| +++ b/cmake/AWSSDKConfig.cmake | ||
| @@ -129,11 +129,13 @@ endif() | ||
| get_filename_component(TEMP_PATH "${AWSSDK_CORE_LIB_FILE}" PATH) | ||
| get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) | ||
|
|
||
| -while (NOT TEMP_NAME STREQUAL ${LIB_SEARCH_PREFIX}) | ||
| - set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") | ||
| - get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) | ||
| - get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) | ||
| -endwhile() | ||
| +if(LIB_SEARCH_PREFIX) | ||
| + while (NOT TEMP_NAME STREQUAL "${LIB_SEARCH_PREFIX}") | ||
| + set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") | ||
| + get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) | ||
| + get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) | ||
| + endwhile() | ||
| +endif() | ||
|
|
||
| set(AWSSDK_PLATFORM_PREFIX "${TEMP_PLATFORM_PREFIX}") | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake | ||
| index c92652cc5..e2fa5e27a 100644 | ||
| --- a/cmake/compiler_settings.cmake | ||
| +++ b/cmake/compiler_settings.cmake | ||
| @@ -53,7 +53,7 @@ macro(set_gcc_flags) | ||
| endmacro() | ||
|
|
||
| macro(set_gcc_warnings) | ||
| - list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") | ||
| + list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra") | ||
| if(COMPILER_CLANG) | ||
| if(PLATFORM_ANDROID) | ||
| # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. | ||
|
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 6039819..b74b65c 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -158,7 +158,7 @@ else() | ||
| endif() | ||
|
|
||
| install(EXPORT "${PROJECT_NAME}-targets" | ||
| - DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" | ||
| + DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" | ||
| NAMESPACE AWS:: | ||
| COMPONENT Development) | ||
|
|
||
| diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake | ||
| index 73e7311..e87c43a 100644 | ||
| --- a/cmake/aws-c-cal-config.cmake | ||
| +++ b/cmake/aws-c-cal-config.cmake | ||
| @@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE) | ||
| find_dependency(LibCrypto) | ||
| endif() | ||
|
|
||
| -if (BUILD_SHARED_LIBS) | ||
| - include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) | ||
| -else() | ||
| - include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) | ||
| -endif() | ||
| +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| diff --git a/cmake/modules/Findcrypto.cmake b/cmake/modules/Findcrypto.cmake | ||
| index fed83bb..9c1ae28 100644 | ||
| --- a/cmake/modules/Findcrypto.cmake | ||
| +++ b/cmake/modules/Findcrypto.cmake | ||
| @@ -105,9 +105,6 @@ else() | ||
| set(CRYPTO_FOUND true) | ||
| set(crypto_FOUND true) | ||
| diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake | ||
| index 564ba97..f748212 100644 | ||
| --- a/cmake/modules/FindLibCrypto.cmake | ||
| +++ b/cmake/modules/FindLibCrypto.cmake | ||
| @@ -89,9 +89,6 @@ else() | ||
| set(LIBCRYPTO_FOUND true) | ||
| set(LibCrypto_FOUND true) | ||
|
|
||
| - message(STATUS "LibCrypto Include Dir: ${crypto_INCLUDE_DIR}") | ||
| - message(STATUS "LibCrypto Shared Lib: ${crypto_SHARED_LIBRARY}") | ||
| - message(STATUS "LibCrypto Static Lib: ${crypto_STATIC_LIBRARY}") | ||
| if (NOT TARGET AWS::crypto AND | ||
| (EXISTS "${crypto_LIBRARY}") | ||
| - message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") | ||
| - message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") | ||
| - message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") | ||
| if (NOT TARGET crypto AND | ||
| (EXISTS "${LibCrypto_LIBRARY}") | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 9b01f56..3cc541d 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -239,7 +239,7 @@ else() | ||
| endif() | ||
|
|
||
| install(EXPORT "${PROJECT_NAME}-targets" | ||
| - DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" | ||
| + DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake" | ||
| NAMESPACE AWS:: | ||
| COMPONENT Development) | ||
|
|
||
| diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake | ||
| index e495210..b7676c2 100644 | ||
| --- a/cmake/aws-c-common-config.cmake | ||
| +++ b/cmake/aws-c-common-config.cmake | ||
| @@ -4,9 +4,5 @@ if(WIN32 OR UNIX OR APPLE) | ||
| find_package(Threads REQUIRED) | ||
| endif() | ||
|
|
||
| -if (BUILD_SHARED_LIBS) | ||
| - include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) | ||
| -else() | ||
| - include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) | ||
| -endif() | ||
| +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.