early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

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

View File

@@ -0,0 +1,21 @@
diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp
--- a/source/io/TlsOptions.cpp (revision 9ef58ff20df19e613c91c5f761e381c763da6810)
+++ b/source/io/TlsOptions.cpp (date 1635309758483)
@@ -90,7 +90,7 @@
return ctxOptions;
}
#endif /* !AWS_OS_IOS */
-#if defined(AWS_OS_APPLE)
+#if defined(AWS_OS_MACOS)
TlsContextOptions TlsContextOptions::InitClientWithMtlsPkcs12(
const char *pkcs12Path,
const char *pkcs12Pwd,
@@ -111,7 +111,7 @@
AWS_ASSERT(m_isInit);
return aws_tls_ctx_options_set_keychain_path(&m_options, &keychain_path) == 0;
}
-#endif /* AWS_OS_APPLE */
+#endif /* AWS_OS_MACOS */
#ifdef _WIN32
TlsContextOptions TlsContextOptions::InitClientWithMtlsSystemPath(

View File

@@ -0,0 +1,44 @@
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
fix-ios-build.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
"-DSTATIC_CRT=${STATIC_CRT}"
-DBUILD_DEPS=OFF
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
-DBUILD_TESTING=FALSE
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/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-crt-cpp"
"${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

32
externals/vcpkg/ports/aws-crt-cpp/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,32 @@
{
"name": "aws-crt-cpp",
"version": "0.15.1",
"port-version": 3,
"description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
"homepage": "https://github.com/awslabs/aws-crt-cpp",
"supports": "!(windows & 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
}
]
}