3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[aws-sdk-cpp] Fix the path in the export cmake config (#21240)

Browse Source 
* Adjust exported AWSSDK_DEFAULT_ROOT_DIR for vcpkg

* Update versions
This commit is contained in:
Kai Pastor 2021-11-09 06:03:08 +01:00 committed by GitHub
parent 2163a5778a
commit 09ec3633a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/aws-sdk-cpp/fix-aws-root.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
index 83eac0b..96bdbe7 100644
--- a/cmake/AWSSDKConfig.cmake
+++ b/cmake/AWSSDKConfig.cmake
@@ -63,11 +63,9 @@ endif()
# Compute the default installation root relative to this file.
-# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix
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)
-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.")

1
ports/aws-sdk-cpp/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d
PATCHES
patch-relocatable-rpath.patch
fix-aws-root.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

2
ports/aws-sdk-cpp/vcpkg.json
View File

@ -2,7 +2,7 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.96",
"port-version": 3,
"port-version": 4,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!arm & !uwp",

5
versions/a-/aws-sdk-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fc86d9dc77f15fb8c7c18f767cc21e01e024a8cc",
"version": "1.9.96",
"port-version": 4
},
{
"git-tree": "74ac36ae24b2c852423a57305005fd86d23d51d9",
"version": "1.9.96",

2
versions/baseline.json
View File

@ -306,7 +306,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.9.96",
"port-version": 3
"port-version": 4
},
"azmq": {
"baseline": "2020-03-03",