diff options
| author | Charles-Auguste Marois <cmarois@coveo.com> | 2021-09-20 13:01:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 10:01:46 -0700 |
| commit | 2d07df55aff57323707368579215d4afda2a2ca8 (patch) | |
| tree | 4ccede1aa7221b61a6d9f26823fcc25dc8a605f8 /ports/aws-sdk-cpp | |
| parent | 6fd6830d68fbab599ad78138d3e6d87dcbcbb016 (diff) | |
| download | vcpkg-2d07df55aff57323707368579215d4afda2a2ca8.tar.gz vcpkg-2d07df55aff57323707368579215d4afda2a2ca8.zip | |
[aws-sdk-cpp] Fix targets for aws-sdk-cpp components (#20222)
* [s2n] Add missing release target
* [aws-sdk-cpp] Fix targets
Diffstat (limited to 'ports/aws-sdk-cpp')
| -rw-r--r-- | ports/aws-sdk-cpp/portfile.cmake | 38 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/vcpkg.json | 2 |
2 files changed, 21 insertions, 19 deletions
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", |