aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-04-05 18:46:09 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-04-06 14:44:01 -0700
commit997fddb3c1a3acb7579e1fe0ab82436b227a0dc4 (patch)
tree55bd0b7192df84b2e13bef54a7edcc59c93b0f98
parent89201f4aecdfefb2cc456b4f71e9dcf63c1d93c9 (diff)
downloadvcpkg-997fddb3c1a3acb7579e1fe0ab82436b227a0dc4.tar.gz
vcpkg-997fddb3c1a3acb7579e1fe0ab82436b227a0dc4.zip
[aws-sdk-cpp] Fix linux
-rw-r--r--ports/aws-sdk-cpp/CONTROL6
-rw-r--r--ports/aws-sdk-cpp/CONTROL.in3
-rw-r--r--ports/aws-sdk-cpp/compute_build_only.cmake3
-rw-r--r--ports/aws-sdk-cpp/portfile.cmake7
4 files changed, 15 insertions, 4 deletions
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index b6a7785f2..2d6642faa 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,6 +1,7 @@
Source: aws-sdk-cpp
-Version: 1.4.30
+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
# 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 ac63ac850..6263b2b45 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -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}