3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 05:28:01 +08:00
Code Issues Projects Releases Wiki Activity

[aws-sdk-cpp] update to 1.9.96 (#20033)

Browse Source 
* [aws-c-common] Update to 0.6.9

* [aws-checksums] Update to 0.1.11

* [aws-c-event-stream] Upgrade to 0.2.7

* Add aws-c-cal port

* Add s2n port

* Add port aws-c-io

* [aws-c-event-stream] Update port to 0.2.7

* Update aws-sdk-cpp port

* Add aws-c-compression port

* Add aws-c-auth port

* Add aws-c-http port

* Add aws-c-mqtt port

* Add aws-c-s3 port

* Add aws-crt-cpp port

* [aws-sdk-cpp] Update port to 1.9.91 version

* Fix port issues.

* Upgrade aws-sdk-cpp to 1.9.96
Upgrade aws-crt-cpp to 0.15.1

* Support x64-windows

* Fix format issues

* Specify supported triplets for aws libs

* Specify platforms for more aws libs

* Support x64-windows-static triplet.

* Fix format issue for aws-c-common

* Update port versions file

* Use new vcpkg cmake methods and format

* Use new vcpkg cmake methods and format

* update version

* Fix s2n port typo

* Fix s2n port typo

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Charles-Auguste Marois 2021-09-14 22:06:34 -04:00 committed by GitHub
parent 5395ad9a4f
commit 92af1ff59a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 1069 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/aws-c-auth/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a00afa..eba3d43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-auth-config.cmake b/cmake/aws-c-auth-config.cmake
index 430c1d7..6adbe53 100644
--- a/cmake/aws-c-auth-config.cmake
+++ b/cmake/aws-c-auth-config.cmake
@@ -5,9 +5,5 @@ find_dependency(aws-c-cal)
find_dependency(aws-c-io)
find_dependency(aws-c-http)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

39
ports/aws-c-auth/portfile.cmake Normal file
View File

@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-auth
REF 61b6524960ad5e0c7aa2e38b343425d5941781bf # v0.6.3
SHA512 b5dda92e4a8796f3f1b8e2d326f57979a673f57325c921cdbc9c44273ada2f2a8eb6723f0292d223175ba4cca24508d2b635fad2af5ec7dd9e7b06db9588ede6
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-auth/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-auth"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-auth"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

23
ports/aws-c-auth/vcpkg.json Normal file
View File

@ -0,0 +1,23 @@
{
"name": "aws-c-auth",
"version": "0.6.3",
"description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
"homepage": "https://github.com/awslabs/aws-c-auth",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-common",
"aws-c-http",
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-c-cal/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6039819..b74b65c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake
index 73e7311..e87c43a 100644
--- a/cmake/aws-c-cal-config.cmake
+++ b/cmake/aws-c-cal-config.cmake
@@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE)
find_dependency(LibCrypto)
endif()
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

44
ports/aws-c-cal/portfile.cmake Normal file
View File

@ -0,0 +1,44 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-cal
REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11
SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake)
vcpkg_copy_tools(
TOOL_NAMES sha256_profile
AUTO_CLEAN
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-cal"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

18
ports/aws-c-cal/vcpkg.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "aws-c-cal",
"version": "0.5.11",
"description": "C99 wrapper for cryptography primitives.",
"homepage": "https://github.com/awslabs/aws-c-cal",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-common",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

15
ports/aws-c-common/disable-error-4068.patch
View File

@ -1,15 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8a7328..9b01f56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,6 +163,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
target_compile_definitions(${PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
endif()
+if (WIN32)
+ add_compile_options(/wd4068)
+endif()
+
aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
target_link_libraries(${PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
target_compile_definitions(${PROJECT_NAME} PRIVATE ${PLATFORM_DEFINES})

18
ports/aws-c-common/disable_outline_atomics.patch
View File

@ -1,18 +0,0 @@
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
--- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334)
+++ b/cmake/AwsCFlags.cmake (date 1618758078727)
@@ -70,9 +70,11 @@
# -moutline-atomics generates code for both older load/store exclusive atomics and also
# Arm's Large System Extensions (LSE) which scale substantially better on large core count systems
- check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
- if (HAS_MOUTLINE_ATOMICS)
- list(APPEND AWS_C_FLAGS -moutline-atomics)
+ if(NOT EMSCRIPTEN AND NOT ANDROID)
+ check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
+ if (HAS_MOUTLINE_ATOMICS)
+ list(APPEND AWS_C_FLAGS -moutline-atomics)
+ endif()
endif()
endif()

12
ports/aws-c-common/disable_warnings_as_errors.patch
View File

@ -1,12 +0,0 @@
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
--- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334)
+++ b/cmake/AwsCFlags.cmake (date 1622068907622)
@@ -48,7 +48,7 @@
list(APPEND AWS_C_FLAGS "${_FLAGS}")
else()
- list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes)
if(NOT SET_PROPERTIES_NO_WEXTRA)
list(APPEND AWS_C_FLAGS -Wextra)

27
ports/aws-c-common/portfile.cmake
View File

@ -1,36 +1,33 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9
SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a
HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
disable_warnings_as_errors.patch # Ref https://github.com/awslabs/aws-c-common/pull/798
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
disable_outline_atomics.patch # Disables -moutline-atomics flag which is not supported for wasm32 and Android
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common
${CURRENT_PACKAGES_DIR}/lib/aws-c-common
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-common"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

15
ports/aws-c-common/vcpkg.json
View File

@ -1,8 +1,17 @@
{
"name": "aws-c-common",
"version-string": "0.4.56",
"port-version": 2,
"version": "0.6.9",
"description": "AWS common library for C",
"homepage": "https://github.com/awslabs/aws-c-common",
"supports": "!(arm | uwp)"
"supports": "!arm & !uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-c-compression/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e70e013..0639229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-compression-config.cmake b/cmake/aws-c-compression-config.cmake
index d919e90..707ce3a 100644
--- a/cmake/aws-c-compression-config.cmake
+++ b/cmake/aws-c-compression-config.cmake
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-common)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

32
ports/aws-c-compression/portfile.cmake Normal file
View File

@ -0,0 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-compression
REF 5fab8bc5ab5321d86f6d153b06062419080820ec # v0.2.14
SHA512 0063d0d644824d858211840115c17a33bfc2b67799e886c530ea8a42071b7bfc67bb6cf8135c538a292b8a7a6276b1d24bb7649f37ce335bc16938f2fca5cb7d
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-compression/cmake)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-compression"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-compression"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

18
ports/aws-c-compression/vcpkg.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "aws-c-compression",
"version": "0.2.14",
"description": "C99 implementation of huffman encoding/decoding",
"homepage": "https://github.com/awslabs/aws-c-compression",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-common",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

8
ports/aws-c-event-stream/fix-cmake-target-path.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dddcc5d..55ff45f 100644
index daf434c..32d7851 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ else()
@@ -91,7 +91,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
@ -12,11 +12,11 @@ index dddcc5d..55ff45f 100644
COMPONENT Development)
diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
index e881cb8..cb817e4 100644
index 76adb84..7884368 100644
--- a/cmake/aws-c-event-stream-config.cmake
+++ b/cmake/aws-c-event-stream-config.cmake
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-common)
find_dependency(aws-c-io)
find_dependency(aws-checksums)
-if (BUILD_SHARED_LIBS)

22
ports/aws-c-event-stream/portfile.cmake
View File

@ -1,32 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-event-stream
REF 873f1c035a5b6b4698280ee3798d1db5cc9ce86c # v0.1.6
SHA512 1d043b6915046498f5b94f9c23e0256ab780b11a75ad9ba3c608e26129567482a58787f4e69c4df3c21a29a6d13ed7dddc46869f695bb268e6867298b73edf30
REF e87537be561d753ec82e783bc0929b1979c585f8 # v0.2.7
SHA512 651b05ba6d87ad8f65f6cf7e8940b7ea500722848f3e65c2de0bf84d2e6321d0aa1631d4f64a78cf5ed5ed5adac6805a4e91e5c31b3ae86e8c37afb38da4c786
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-event-stream/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-event-stream/cmake)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream
${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

17
ports/aws-c-event-stream/vcpkg.json
View File

@ -1,10 +1,21 @@
{
"name": "aws-c-event-stream",
"version-string": "0.1.6",
"port-version": 1,
"version": "0.2.7",
"description": "C99 implementation of the vnd.amazon.event-stream content-type.",
"homepage": "https://github.com/awslabs/aws-c-event-stream",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-cal",
"aws-c-common",
"aws-checksums"
"aws-c-io",
"aws-checksums",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-c-http/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b0d8e5..d46b498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-http-config.cmake b/cmake/aws-c-http-config.cmake
index 8633305..eb7f364 100644
--- a/cmake/aws-c-http-config.cmake
+++ b/cmake/aws-c-http-config.cmake
@@ -3,9 +3,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-io)
find_dependency(aws-c-compression)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

44
ports/aws-c-http/portfile.cmake Normal file
View File

@ -0,0 +1,44 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-http
REF 6ff61d621c374ab763f94584d26b1d29baa81c2e # v0.6.5
SHA512 91a5f3c18e6c8d14368ad2b7275a1ebcc6398758f6b1f87ba6199998390a26e768e25c16b27f589e35371f7304b6784cfc21699ff724c811135f2f73732fe85b
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake)
vcpkg_copy_tools(
TOOL_NAMES elasticurl
AUTO_CLEAN
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-http"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-http"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

21
ports/aws-c-http/vcpkg.json Normal file
View File

@ -0,0 +1,21 @@
{
"name": "aws-c-http",
"version": "0.6.5",
"description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
"homepage": "https://github.com/awslabs/aws-c-http",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-cal",
"aws-c-common",
"aws-c-compression",
"aws-c-io",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

27
ports/aws-c-io/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a9099..a657782 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-io-config.cmake b/cmake/aws-c-io-config.cmake
index d4bc525..72a78ec 100644
--- a/cmake/aws-c-io-config.cmake
+++ b/cmake/aws-c-io-config.cmake
@@ -7,8 +7,4 @@ endif()
find_dependency(aws-c-common)
find_dependency(aws-c-cal)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

32
ports/aws-c-io/portfile.cmake Normal file
View File

@ -0,0 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-io
REF 57b00febac48e78f8bf8cff4c82a249e6648842a # v0.10.7
SHA512 ffcf5ba4ccdff23ca390fc4eb935f88040447589886348234aa1c24b531401521df99a6ac578c1679a3c1a06dfcef6deb833a0b9d53e31d42576a3ad03ade6fc
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-io/cmake)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-io"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-io"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

23
ports/aws-c-io/vcpkg.json Normal file
View File

@ -0,0 +1,23 @@
{
"name": "aws-c-io",
"version": "0.10.7",
"description": "Handles all IO and TLS work for application protocols.",
"homepage": "https://github.com/awslabs/aws-c-io",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-cal",
"aws-c-common",
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-c-mqtt/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d80abb..36c027f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-mqtt-config.cmake b/cmake/aws-c-mqtt-config.cmake
index 4a4dcbb..2ad48d2 100644
--- a/cmake/aws-c-mqtt-config.cmake
+++ b/cmake/aws-c-mqtt-config.cmake
@@ -6,9 +6,5 @@ if (@MQTT_WITH_WEBSOCKETS@)
find_dependency(aws-c-http)
endif()
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

44
ports/aws-c-mqtt/portfile.cmake Normal file
View File

@ -0,0 +1,44 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-mqtt
REF 0a70bf814845e487b7e4862af7ad9e4a1199b5f4 # v0.7.6
SHA512 9c8719004e9e4c56f270c5c5dcb41b5ecacb050dadf2a548ab2119a1a8f223c9117829346e2e86c8c77f6efe3502019085344fe4f470ccdd646dc87a3d4f4c3f
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake)
vcpkg_copy_tools(
TOOL_NAMES elastipubsub
AUTO_CLEAN
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-mqtt"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-mqtt"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

21
ports/aws-c-mqtt/vcpkg.json Normal file
View File

@ -0,0 +1,21 @@
{
"name": "aws-c-mqtt",
"version": "0.7.6",
"description": "C99 implementation of the MQTT 3.1.1 specification.",
"homepage": "https://github.com/awslabs/aws-c-mqtt",
"supports": "!arm & !uwp",
"dependencies": [
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-c-s3/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 318b299..43f6d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-s3-config.cmake b/cmake/aws-c-s3-config.cmake
index eb62a4b..24debd9 100644
--- a/cmake/aws-c-s3-config.cmake
+++ b/cmake/aws-c-s3-config.cmake
@@ -3,8 +3,4 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-auth)
find_dependency(aws-c-http)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
\ No newline at end of file

39
ports/aws-c-s3/portfile.cmake Normal file
View File

@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-s3
REF e38bdad12bd4c618e8d10489374d87e6ae3f7a19 # v0.1.25
SHA512 1ed3313419416ce28373968cb692cf67230b1efced4e187cd5047b146db3bc769dc283dff1af2e41b05ad6f50cbeea58718a34945a93645abacca2515f2a6cf1
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-s3/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-s3"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-s3"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

27
ports/aws-c-s3/vcpkg.json Normal file
View File

@ -0,0 +1,27 @@
{
"name": "aws-c-s3",
"version": "0.1.25",
"description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
"homepage": "https://github.com/awslabs/aws-c-s3",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-auth",
"aws-c-cal",
"aws-c-common",
"aws-c-compression",
"aws-c-http",
"aws-c-io",
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

26
ports/aws-checksums/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-checksums
REF fb96b3e964fe9bde2625c3ac9547e54d6c802211 # v0.1.9
SHA512 2cf63a462c900fae8ad101ecac8be6fd6ce3f796e3cecc1b3d19ffba364030d7468a7c7beab91594d2521cab5e99765c7b67fa2fef6f772457e04f75f59962cc
REF 99bb0ad4b89d335d638536694352c45e0d2188f5 # v0.1.11
SHA512 cb9c249496fd41fda1efb9330e823d8b965adca6c8f372a50fe97eda821e277780bf9af8f5977102c44121568993cca55edbb750967b41f323e07e06a93c50a8
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
@ -13,27 +13,27 @@ else()
set(STATIC_CRT_LNK OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
-DSTATIC_CRT=${STATIC_CRT_LNK}
-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common # use extra cmake files
"-DSTATIC_CRT=${STATIC_CRT_LNK}"
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-checksums/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-checksums/cmake)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums
${CURRENT_PACKAGES_DIR}/lib/aws-checksums
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums"
"${CURRENT_PACKAGES_DIR}/lib/aws-checksums"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

16
ports/aws-checksums/vcpkg.json
View File

@ -1,10 +1,18 @@
{
"name": "aws-checksums",
"version-string": "0.1.9",
"port-version": 1,
"version": "0.1.11",
"description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
"supports": "!(arm & windows)",
"homepage": "https://github.com/awslabs/aws-checksums",
"supports": "!arm & !windows",
"dependencies": [
"aws-c-common"
"aws-c-common",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

28
ports/aws-crt-cpp/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d935e2..7b0501c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-crt-cpp-config.cmake b/cmake/aws-crt-cpp-config.cmake
index 4b20a07..faac626 100644
--- a/cmake/aws-crt-cpp-config.cmake
+++ b/cmake/aws-crt-cpp-config.cmake
@@ -7,8 +7,4 @@ find_dependency(aws-c-auth)
find_dependency(aws-c-event-stream)
find_dependency(aws-c-s3)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else ()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
\ No newline at end of file

48
ports/aws-crt-cpp/portfile.cmake Normal file
View File

@ -0,0 +1,48 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-crt-cpp
REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1
SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463
PATCHES
fix-cmake-target-path.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DSTATIC_CRT=${STATIC_CRT}"
"-DBUILD_DEPS=OFF"
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake)
vcpkg_copy_tools(
TOOL_NAMES elasticurl_cpp
AUTO_CLEAN
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp"
"${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

31
ports/aws-crt-cpp/vcpkg.json Normal file
View File

@ -0,0 +1,31 @@
{
"name": "aws-crt-cpp",
"version": "0.15.1",
"description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
"homepage": "https://github.com/awslabs/aws-crt-cpp",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-auth",
"aws-c-cal",
"aws-c-common",
"aws-c-compression",
"aws-c-event-stream",
"aws-c-http",
"aws-c-io",
"aws-c-mqtt",
"aws-c-s3",
"aws-checksums",
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

31
ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch
View File

@ -1,31 +0,0 @@
diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
index c2f643e..4fb4a2f 100644
--- a/cmake/AWSSDKConfig.cmake
+++ b/cmake/AWSSDKConfig.cmake
@@ -24,6 +24,10 @@ if(AWSSDK_FOUND)
return()
endif()
+include(CMakeFindDependencyMacro)
+find_dependency(OpenSSL)
+find_dependency(ZLIB)
+
include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake)
@@ -43,7 +47,6 @@ endif()
# On Windows, dlls are treated as runtime target and installed in bindir
if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS)
- set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}")
# If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers
add_definitions(-DUSE_IMPORT_EXPORT)
endif()
@@ -54,7 +57,6 @@ endif()
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.")

4
ports/aws-sdk-cpp/patch-relocatable-rpath.patch
View File

@ -8,5 +8,5 @@ index a653e38628..76d6067646 100644
# Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
# build third-party targets
if (BUILD_DEPS)
# build the sdk targets
project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)

63
ports/aws-sdk-cpp/portfile.cmake
View File

@ -3,20 +3,14 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF b11ed430fa6a574cc842532192dfeb9bb09e62b4 # 1.8.126
SHA512 39e71f85d977b183df6f0d6d61a028db33573026f6abb8856f35e0e71398e2749db6dbdd033818a2c045ec42076fb23cdbae92608117db0a08ca88a05c825683
HEAD_REF master
REF b0204a7b6a33211f533a175e987a755f714bf7f3 # 1.9.96
SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d
PATCHES
patch-relocatable-rpath.patch
fix-AWSSDKCONFIG.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
set(BUILD_ONLY core)
include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
set(EXTRA_ARGS)
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
set(rpath "@loader_path")
@ -43,26 +37,29 @@ elseif (VCPKG_TARGET_IS_ANDROID)
else()
set(rpath "\$ORIGIN")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
${EXTRA_ARGS}
-DENABLE_UNITY_BUILD=ON
-DENABLE_TESTING=OFF
-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
"-DBUILD_ONLY=${BUILD_ONLY}"
-DBUILD_DEPS=OFF
-DCMAKE_INSTALL_RPATH=${rpath}
)
vcpkg_install_cmake()
set(BUILD_ONLY core)
include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
vcpkg_copy_pdbs()
foreach(TARGET IN LISTS BUILD_ONLY)
message(STATUS "Building ${TARGET}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
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()
file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
foreach(AWS_TARGET IN LISTS AWS_TARGETS)
@ -82,12 +79,12 @@ foreach(AWS_CONFIG IN LISTS AWS_CONFIGS)
endforeach()
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/lib/pkgconfig
${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
${CURRENT_PACKAGES_DIR}/nuget
${CURRENT_PACKAGES_DIR}/debug/nuget
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
"${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig"
"${CURRENT_PACKAGES_DIR}/nuget"
"${CURRENT_PACKAGES_DIR}/debug/nuget"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -108,4 +105,4 @@ endif()
configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

24
ports/aws-sdk-cpp/vcpkg.in.json
View File

@ -1,24 +0,0 @@
{
"name": "aws-sdk-cpp",
"version": "1.8.126",
"port-version": 10,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"dependencies": [
"aws-c-event-stream",
{
"name": "curl",
"platform": "!uwp & !windows"
},
{
"name": "openssl",
"platform": "!uwp & !windows"
},
"zlib"
],
"default-features": [
"dynamodb",
"kinesis",
"s3"
]
}

14
ports/aws-sdk-cpp/vcpkg.json
View File

@ -1,12 +1,12 @@
{
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.8.126",
"port-version": 10,
"version": "1.9.96",
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-event-stream",
"aws-crt-cpp",
{
"name": "curl",
"platform": "!uwp & !windows"
@ -15,6 +15,14 @@
"name": "openssl",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
],
"default-features": [

28
ports/s2n/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 132f414..c7cfb5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,7 +503,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
index 09d1c3a..4e76ed6 100644
--- a/cmake/s2n-config.cmake
+++ b/cmake/s2n-config.cmake
@@ -8,9 +8,5 @@ endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
find_dependency(LibCrypto)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

31
ports/s2n/portfile.cmake Normal file
View File

@ -0,0 +1,31 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/s2n-tls
REF b5b313b9ccddf268b30c642798f1d2a58d49ecd6 # v1.0.17
SHA512 59750c9a3c9330e2b26b84d45665b222d23475090736d8299f81352c839a09af10be0d49d34ced1dadae65ca255e819df45b648387e26b7dca31d74782fdb834
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
)
vcpkg_cmake_install()
file(GLOB SHARED_CMAKE_FILES
"${CURRENT_PACKAGES_DIR}/debug/lib/s2n"
)
file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug"
"${CURRENT_PACKAGES_DIR}/lib/s2n"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

17
ports/s2n/vcpkg.json Normal file
View File

@ -0,0 +1,17 @@
{
"name": "s2n",
"version": "1.0.17",
"description": "C99 implementation of the TLS/SSL protocols.",
"homepage": "https://github.com/aws/s2n-tls",
"supports": "!uwp & !windows",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

9
versions/a-/aws-c-auth.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "09b8dcb5acc3e1f83c8b5e3f8b242db3d85f468b",
"version": "0.6.3",
"port-version": 0
}
]
}

9
versions/a-/aws-c-cal.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "7495a338fdd1313d3cdfb67e69406eb4ecea02e9",
"version": "0.5.11",
"port-version": 0
}
]
}

5
versions/a-/aws-c-common.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e0cf8500b71dc430f8d688db62f277b6c20a2a74",
"version": "0.6.9",
"port-version": 0
},
{
"git-tree": "da525f4c21c19e8eb2d81d6f352467395b55f354",
"version-string": "0.4.56",

9
versions/a-/aws-c-compression.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "e9dd3757cfe02e9e9d6d4d0bf772507c1be3794e",
"version": "0.2.14",
"port-version": 0
}
]
}

5
versions/a-/aws-c-event-stream.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0556f6ff7d7a2e270825de650d84e97c1ed2cf9b",
"version": "0.2.7",
"port-version": 0
},
{
"git-tree": "d2daec107d6c9d3077a4623d3cf341304a309852",
"version-string": "0.1.6",

9
versions/a-/aws-c-http.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "21701228d8dca8d718f990273734749288100cdd",
"version": "0.6.5",
"port-version": 0
}
]
}

9
versions/a-/aws-c-io.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "fd430ec2c2c43582b0765a48e0a724d17747ae36",
"version": "0.10.7",
"port-version": 0
}
]
}

9
versions/a-/aws-c-mqtt.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "a7ac0c5bddb07cc6ef49fe32f845efb230d28059",
"version": "0.7.6",
"port-version": 0
}
]
}

9
versions/a-/aws-c-s3.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "074cd08f0a073d8b1bfc551bd47435aa50ea96da",
"version": "0.1.25",
"port-version": 0
}
]
}

5
versions/a-/aws-checksums.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "60a67f9776bc5957aa27bf0cd2ad36fb10a7bc04",
"version": "0.1.11",
"port-version": 0
},
{
"git-tree": "faeacfa4356bdc71228a197676b7613cf369520c",
"version-string": "0.1.9",

9
versions/a-/aws-crt-cpp.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0",
"version": "0.15.1",
"port-version": 0
}
]
}

5
versions/a-/aws-sdk-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa",
"version": "1.9.96",
"port-version": 0
},
{
"git-tree": "13f162ba967b3eaa61320e2062eabd924e1f7a65",
"version": "1.8.126",

52
versions/baseline.json
View File

@ -248,25 +248,57 @@
"baseline": "2021-06-01",
"port-version": 0
},
"aws-c-auth": {
"baseline": "0.6.3",
"port-version": 0
},
"aws-c-cal": {
"baseline": "0.5.11",
"port-version": 0
},
"aws-c-common": {
"baseline": "0.4.56",
"port-version": 2
"baseline": "0.6.9",
"port-version": 0
},
"aws-c-compression": {
"baseline": "0.2.14",
"port-version": 0
},
"aws-c-event-stream": {
"baseline": "0.1.6",
"port-version": 1
"baseline": "0.2.7",
"port-version": 0
},
"aws-c-http": {
"baseline": "0.6.5",
"port-version": 0
},
"aws-c-io": {
"baseline": "0.10.7",
"port-version": 0
},
"aws-c-mqtt": {
"baseline": "0.7.6",
"port-version": 0
},
"aws-c-s3": {
"baseline": "0.1.25",
"port-version": 0
},
"aws-checksums": {
"baseline": "0.1.9",
"port-version": 1
"baseline": "0.1.11",
"port-version": 0
},
"aws-crt-cpp": {
"baseline": "0.15.1",
"port-version": 0
},
"aws-lambda-cpp": {
"baseline": "0.2.6",
"port-version": 1
},
"aws-sdk-cpp": {
"baseline": "1.8.126",
"port-version": 10
"baseline": "1.9.96",
"port-version": 0
},
"azmq": {
"baseline": "2020-03-03",
@ -5800,6 +5832,10 @@
"baseline": "2.0",
"port-version": 5
},
"s2n": {
"baseline": "1.0.17",
"port-version": 0
},
"safeint": {
"baseline": "3.0.26",
"port-version": 0

9
versions/s-/s2n.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "10a083844c389053abc2f6ca624f9080712b6b34",
"version": "1.0.17",
"port-version": 0
}
]
}