diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/aws-sdk-cpp | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/aws-sdk-cpp')
| -rw-r--r-- | ports/aws-sdk-cpp/CONTROL | 4 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/compute_build_only.cmake | 2 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/portfile.cmake | 15 |
3 files changed, 8 insertions, 13 deletions
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 987812ea5..93be6843d 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.7.142-1 +Version: 1.7.214-1 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 @@ -51,7 +51,7 @@ Description: C++ SDK for the AWS autoscaling service Feature: autoscaling-plans Description: C++ SDK for the AWS autoscaling-plans service -Feature: AWSMigrationHub +Feature: awsmigrationhub Description: C++ SDK for the AWS AWSMigrationHub service Feature: awstransfer diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 66576f241..ba9bcb26d 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -44,7 +44,7 @@ endif() if("autoscaling-plans" IN_LIST FEATURES) list(APPEND BUILD_ONLY autoscaling-plans) endif() -if("AWSMigrationHub" IN_LIST FEATURES) +if("awsmigrationhub" IN_LIST FEATURES) list(APPEND BUILD_ONLY AWSMigrationHub) endif() if("awstransfer" IN_LIST FEATURES) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index c39e3391e..9fa6b2f5f 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions)
-
vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
- REF d3ee022fea02e8e7e02f3cdd77904dc4c39ab79a - SHA512 6f146830f15864bb3770ad50a6ebcbc478235e9c2c59aa044353bbfc297bf26437e07b77b970974cc294782809aaa837a3407cbc846426b04e97447cd7f9e3cf
+ REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
+ SHA512 dc4e003ffaebf21410d8d360f8a4602dda99d3ee0c0ab7fb61c97fe8b5f0b38438ed5315fb85d3a435cd5a99724e43c5cf569a7cb365ed8137caeac32c619a86
HEAD_REF master
)
@@ -16,14 +14,11 @@ set(BUILD_ONLY core) include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
-if(CMAKE_HOST_WIN32)
- string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
-else()
- string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
-endif()
+string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DENABLE_UNITY_BUILD=ON
@@ -83,4 +78,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|