From 2d07df55aff57323707368579215d4afda2a2ca8 Mon Sep 17 00:00:00 2001
From: Charles-Auguste Marois <cmarois@coveo.com>
Date: Mon, 20 Sep 2021 13:01:46 -0400
Subject: [aws-sdk-cpp] Fix targets for aws-sdk-cpp components (#20222)

* [s2n] Add missing release target

* [aws-sdk-cpp] Fix targets
---
 ports/aws-sdk-cpp/portfile.cmake | 38 ++++++++++++++++++++------------------
 ports/aws-sdk-cpp/vcpkg.json     |  2 +-
 ports/s2n/portfile.cmake         |  7 +++++--
 ports/s2n/vcpkg.json             |  1 +
 4 files changed, 27 insertions(+), 21 deletions(-)

(limited to 'ports')

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 66cc714a6..eb22b3aa7 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -40,26 +40,28 @@ endif()
 
 set(BUILD_ONLY core)
 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        ${EXTRA_ARGS}
+        "-DENABLE_UNITY_BUILD=ON"
+        "-DENABLE_TESTING=OFF"
+        "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
+        "-DBUILD_ONLY=${BUILD_ONLY}"
+        "-DBUILD_DEPS=OFF"
+        "-DBUILD_SHARED_LIBS=OFF"
+        "-DCMAKE_INSTALL_RPATH=${rpath}"
+        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+)
+vcpkg_cmake_install()
 
 foreach(TARGET IN LISTS BUILD_ONLY)
-    message(STATUS "Building ${TARGET}")
-    vcpkg_cmake_configure(
-        SOURCE_PATH "${SOURCE_PATH}"
-        DISABLE_PARALLEL_CONFIGURE
-        OPTIONS
-            ${EXTRA_ARGS}
-            "-DENABLE_UNITY_BUILD=ON"
-            "-DENABLE_TESTING=OFF"
-            "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
-            "-DBUILD_ONLY=${TARGET}"
-            "-DBUILD_DEPS=OFF"
-            "-DCMAKE_INSTALL_RPATH=${rpath}"
-            "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
-    )
-    vcpkg_cmake_install()
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
-    vcpkg_copy_pdbs()
-endforeach()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endforeach() 
+vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
+
+vcpkg_copy_pdbs()
 
 file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
 foreach(AWS_TARGET IN LISTS AWS_TARGETS)
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 3007b888b..211e80e6d 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
-  "port-version": 1,
+  "port-version": 2,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",
diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake
index ee7d23906..151ba0281 100644
--- a/ports/s2n/portfile.cmake
+++ b/ports/s2n/portfile.cmake
@@ -8,15 +8,18 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
 )
 
 vcpkg_cmake_install()
 
 file(GLOB SHARED_CMAKE_FILES
      "${CURRENT_PACKAGES_DIR}/debug/lib/s2n"
+     "${CURRENT_PACKAGES_DIR}/lib/s2n"
      )
-file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+
+foreach(FILE ${SHARED_CMAKE_FILES})
+    file(COPY "${FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+endforeach()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug"
diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json
index d1fda96ca..51359206e 100644
--- a/ports/s2n/vcpkg.json
+++ b/ports/s2n/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "s2n",
   "version": "1.0.17",
+  "port-version": 1,
   "description": "C99 implementation of the TLS/SSL protocols.",
   "homepage": "https://github.com/aws/s2n-tls",
   "supports": "!uwp & !windows",
-- 
cgit v1.2.3