diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-12-04 16:15:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 16:15:10 -0800 |
| commit | 87a908d7b18c6b16f9c145b664b090edecee338e (patch) | |
| tree | 6ec23c0d52d0287dfa350785714467b10697c413 | |
| parent | 09f0dc0a79f8075606f83b61492e814511b54d9f (diff) | |
| download | vcpkg-87a908d7b18c6b16f9c145b664b090edecee338e.tar.gz vcpkg-87a908d7b18c6b16f9c145b664b090edecee338e.zip | |
[aws-sdk-cpp] Add find_dependency to AWSSDKConfig.cmake and fix usage (#14936)
| -rw-r--r-- | ports/aws-sdk-cpp/CONTROL | 4 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch | 17 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/usage | 12 |
3 files changed, 16 insertions, 17 deletions
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 0492d09f8..1b46d7d36 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,9 +1,9 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib Default-Features: dynamodb, s3, kinesis # Automatically generated by generateFeatures.ps1 diff --git a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch index 0c1c1c525..f35d1be1c 100644 --- a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch +++ b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch @@ -1,8 +1,19 @@ diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake -index c2f643e..5a4d8d2 100644 +index c2f643e..4fb4a2f 100644 --- a/cmake/AWSSDKConfig.cmake +++ b/cmake/AWSSDKConfig.cmake -@@ -43,7 +43,6 @@ endif() +@@ -24,6 +24,10 @@ if(AWSSDK_FOUND) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(ZLIB) ++ + include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake) +@@ -43,7 +47,6 @@ endif() # On Windows, dlls are treated as runtime target and installed in bindir if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) @@ -10,7 +21,7 @@ index c2f643e..5a4d8d2 100644 # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers add_definitions(-DUSE_IMPORT_EXPORT) endif() -@@ -54,7 +53,6 @@ endif() +@@ -54,7 +57,6 @@ endif() get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index 9a9bca1c6..7f3176483 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -3,15 +3,3 @@ The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED)
target_include_directories(main PRVATE ${AWSSDK_INCLUDE_DIRS})
target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES})
-
- find_package(aws-cpp-sdk-core CONFIG REQUIRED)
- target_link_libraries(main PRIVATE aws-cpp-sdk-core)
-
- find_package(aws-cpp-sdk-dynamodb CONFIG REQUIRED)
- target_link_libraries(main PRIVATE aws-cpp-sdk-dynamodb)
-
- find_package(aws-cpp-sdk-kinesis CONFIG REQUIRED)
- target_link_libraries(main PRIVATE aws-cpp-sdk-kinesis)
-
- find_package(aws-cpp-sdk-s3 CONFIG REQUIRED)
- target_link_libraries(main PRIVATE aws-cpp-sdk-s3)
|