Merge remote-tracking branch 'origin/master'

4 files changed, 17 insertions, 6 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index b4004cdc0..c9338b0cc 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,6 +1,7 @@
 Source: aws-sdk-cpp
-Version: 1.4.27
+Version: 1.4.32
 Description: AWS SDK for C++
+Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
 Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
 # Automatically generated by generateFeatures.ps1
 
@@ -103,6 +104,9 @@ Description: C++ SDK for the AWS comprehend service
 Feature: config
 Description: C++ SDK for the AWS config service
 
+Feature: connect
+Description: C++ SDK for the AWS connect service
+
 Feature: cur
 Description: C++ SDK for the AWS cur service
 
diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in
index 5cf05fdff..184374de6 100644
--- a/ports/aws-sdk-cpp/CONTROL.in
+++ b/ports/aws-sdk-cpp/CONTROL.in
@@ -1,4 +1,5 @@
 Source: aws-sdk-cpp

-Version: 1.4.21

+Version: 1.4.30-1

 Description: AWS SDK for C++

+Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)

 Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs

diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake
index a50ed2128..f4a139153 100644
--- a/ports/aws-sdk-cpp/compute_build_only.cmake
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@@ -98,6 +98,9 @@ endif()
 if("config" IN_LIST FEATURES)

   list(APPEND BUILD_ONLY config)

 endif()

+if("connect" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY connect)

+endif()

 if("cur" IN_LIST FEATURES)

   list(APPEND BUILD_ONLY cur)

 endif()

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 26129db5c..6b3b1f241 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.4.27
-    SHA512 d714fe12d3701461b897256d824b169ff3242bb412d386a2c1455c0dc1dcedf3add444eab556551fbb69e0339b49c3133c1f820710b5681d25a23237e919ddd0
+    REF 1.4.32
+    SHA512 f37aaf1d439acd1563fe50624e2e7856ba5d267a540a8cd1fde80d0d7bd9e2cdd261f9f6e3e843548cc17b8ea7158419a9e0ed27092acf5c22b5c9e38d327c64
     HEAD_REF master
 )
 
@@ -14,8 +14,11 @@ set(BUILD_ONLY core)
 
 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
 
-# This handles escaping the list
-string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
+if(CMAKE_HOST_WIN32)
+    string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
+else()
+    string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}