[aws-crt-cpp/aws-sdk-cpp] Disable parallel configure (#20189)

This commit is contained in:
Phoebe 2021-09-17 01:35:18 +08:00 committed by GitHub
parent e14842c446
commit 0aa1422849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 12 deletions

View File

@ -4,14 +4,14 @@ vcpkg_from_github(
REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1
SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463
PATCHES
fix-cmake-target-path.patch
fix-cmake-target-path.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
"-DSTATIC_CRT=${STATIC_CRT}"
"-DBUILD_DEPS=OFF"
@ -35,14 +35,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp"
"${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"
"${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)

View File

@ -1,6 +1,7 @@
{
"name": "aws-crt-cpp",
"version": "0.15.1",
"port-version": 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",

View File

@ -45,7 +45,7 @@ foreach(TARGET IN LISTS BUILD_ONLY)
message(STATUS "Building ${TARGET}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
${EXTRA_ARGS}
"-DENABLE_UNITY_BUILD=ON"
@ -99,10 +99,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(REMOVE ${DEBUG_LIB_FILES})
endif()
file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")
file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")
endif()
configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
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)

View File

@ -2,6 +2,7 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.96",
"port-version": 1,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!arm & !uwp",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "60880034065d31bf96ac71028dab62955a77ba55",
"version": "0.15.1",
"port-version": 1
},
{
"git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0",
"version": "0.15.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5989ba8996df75b9195ef2f429191b48602236c9",
"version": "1.9.96",
"port-version": 1
},
{
"git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa",
"version": "1.9.96",

View File

@ -290,7 +290,7 @@
},
"aws-crt-cpp": {
"baseline": "0.15.1",
"port-version": 0
"port-version": 1
},
"aws-lambda-cpp": {
"baseline": "0.2.6",
@ -298,7 +298,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.9.96",
"port-version": 0
"port-version": 1
},
"azmq": {
"baseline": "2020-03-03",