diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 201d5413f5b..9c373fd607a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,6 +56,9 @@ jobs: - name: Checkout TileDB # v4 uses node 20 which is incompatible with the libc version of the manylinux image uses: actions/checkout@v3 + - name: 'Homebrew setup' + run: brew install automake pkg-config + if: ${{ startsWith(matrix.os, 'macos-') == true }} - name: Export GitHub Actions cache variables uses: actions/github-script@v6 with: diff --git a/.github/workflows/unit-test-runs.yml b/.github/workflows/unit-test-runs.yml index 0b16aede88c..2c17b2dd667 100644 --- a/.github/workflows/unit-test-runs.yml +++ b/.github/workflows/unit-test-runs.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - name: 'Homebrew setup' - run: brew install pkg-config + run: brew install automake pkg-config if: ${{ startsWith(matrix.os, 'macos-') == true }} # Configure required environment variables for vcpkg to use diff --git a/cmake/Options/TileDBToolchain.cmake b/cmake/Options/TileDBToolchain.cmake index 59ed7574c10..d80215128a8 100644 --- a/cmake/Options/TileDBToolchain.cmake +++ b/cmake/Options/TileDBToolchain.cmake @@ -45,7 +45,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE) # Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # To help with resolving conflicts, when you update the commit, also update its date. - set(VCPKG_COMMIT_STRING ac2a14f35fcd57d7a38f09af75dd5258e96dd6ac) # 2023-11-16 + set(VCPKG_COMMIT_STRING 72010900b7cee36cea77aebb97695095c9358eaf) # 2023-12-05 message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}") include(FetchContent) FetchContent_Declare( diff --git a/ports/README.md b/ports/README.md index 7313b9cd2bf..7faf08053d3 100644 --- a/ports/README.md +++ b/ports/README.md @@ -1,22 +1,36 @@ -Port Overlays -=== +# Port Overlays -This directory contains the custom port overlays we're using for building depdencies. We're using overlays because some of our dependencies are quite old and getting working combinations from modern vcpkg was proving untenable. Overtime as our dependency versions are modernized, most if not all of the overlay ports will likely be removed. +This directory contains the custom vcpkg port overlays we're using for building dependencies. -Updating a Port ---- +## Adding a Port -The easiest way to update a port is to find the version of the port in the `microsoft/vcpkg` repository and extract it using a tool. So, for instance if we wanted to update our curl dependency from 7.80.0 to 7.84.0, we would look in the `path/to/microsoft/vcpkg/versions/c-/curl.json` file and find the tree-ish listed for 7.84.0. One thing to pay attention to here is that there can be multiple port versions for a given dependency version. So we want to pick the higest port version for the dependency at the version we are upgrading. In our hypothetical curl case that I may have just done, this gives us a treeish value of: +> [!IMPORTANT] +> Port overlays should be used as a temporary measure to fix issues with upstream ports or to add new ports that are not yet available to vcpkg. Once the upstream ports are fixed or added, the overlay ports should be removed. - `588fa4742c417db9d7c0f89e652b618296388d1e` +If modifying an existing port, you have to first determine the version of the port in the `microsoft/vcpkg` repository and extract it using a tool. If the port does not have a version pin in the [`vcpkg.json`](../vcpkg.json) manifest (in either a `version>=` field or an entry in the `overrides` section), browse the `microsoft/vcpkg` repository in the commit specified in the `builtin-baseline` field and copy the port directory from there. + +If the port does have a version pin, and for instance we wanted to modify the curl port, which is in version 8.4.0, we would look in the [`versions/c-/curl.json` file](https://github.com/microsoft/vcpkg/blob/master/versions/c-/curl.json) and find the treeish listed for 8.4.0. One thing to pay attention to here is that there can be multiple port versions for a given dependency version. So we want to pick the highest port version for the dependency at the version we are upgrading. In our hypothetical curl case that I may have just done, this gives us a treeish value of: + + `6125c796d6e2913a89a2996d7082375ce16b02dd` Once we have the tree-ish, we just need to be able to extract all of the files and store them in our overlay ports directory. The easiest approach for this is to use something like [this script](https://gist.github.com/mhl/498447/b245d48f2a22301415a30ca8a68241f96e0b3861) to do just that. If you put that script on your path (and remember to `chmod +x path/to/extract-tree-from-git.py`) you can follow these simple steps for updating the port: ```bash $ rm ports/curl/* $ cd path/to/microsoft/vcpkg -$ extract-tree-from-git.py 588fa4742c417db9d7c0f89e652b618296388d1e path/to/tiledb/ports/curl/ +$ extract-tree-from-git.py 6125c796d6e2913a89a2996d7082375ce16b02dd path/to/tiledb/ports/curl/ $ cd path/to/tiledb $ git add ports $ git commit ``` + +After copying the port, add an entry to the table below. You should also contribute your changes to vcpkg and/or the upstream package repository. + +## List of port overlays + +|Port|Reason| +|----|------| +|`libmagic`|Updating to the upstream port deferred due to failures.| +|`openssl`|Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024.| +|`pcre2`|To be removed alongside libmagic.| +|`azure-storage-common-cpp`|Patching to disable default features on libxml2 (https://github.com/Azure/azure-sdk-for-cpp/pull/5221).| diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake deleted file mode 100644 index 00ae5a4f017..00000000000 --- a/ports/aws-c-auth/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-auth - REF "v${VERSION}" - SHA512 e247b145132818bb1adf03689fdc98984e6ac50e6d81d0d7caf60d53ba3d3a95bbb4e76f48ac4582365f9038d0d8b29e57947190ec5c34f68e816dd7efcc117d - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json deleted file mode 100644 index 091f5047896..00000000000 --- a/ports/aws-c-auth/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "aws-c-auth", - "version": "0.7.8", - "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", - "homepage": "https://github.com/awslabs/aws-c-auth", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-cal", - "aws-c-http", - "aws-c-sdkutils", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake deleted file mode 100644 index 3cef1fbb282..00000000000 --- a/ports/aws-c-cal/portfile.cmake +++ /dev/null @@ -1,33 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-cal - REF "v${VERSION}" - SHA512 deee106b366522e6781974c92b1aa06542b7857b91a8d4cb59eb0e17247ce7fc3ffacb044c032ff7f2a0f9baca807d4c2d9a14934d4576966f48bfc0661e5edb - HEAD_REF master - PATCHES remove-libcrypto-messages.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-cal/remove-libcrypto-messages.patch b/ports/aws-c-cal/remove-libcrypto-messages.patch deleted file mode 100644 index 5a1d5dc35d0..00000000000 --- a/ports/aws-c-cal/remove-libcrypto-messages.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/modules/Findcrypto.cmake b/cmake/modules/Findcrypto.cmake -index fed83bb..9c1ae28 100644 ---- a/cmake/modules/Findcrypto.cmake -+++ b/cmake/modules/Findcrypto.cmake -@@ -105,9 +105,6 @@ else() - set(CRYPTO_FOUND true) - set(crypto_FOUND true) - -- message(STATUS "LibCrypto Include Dir: ${crypto_INCLUDE_DIR}") -- message(STATUS "LibCrypto Shared Lib: ${crypto_SHARED_LIBRARY}") -- message(STATUS "LibCrypto Static Lib: ${crypto_STATIC_LIBRARY}") - if (NOT TARGET AWS::crypto AND - (EXISTS "${crypto_LIBRARY}") - ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json deleted file mode 100644 index b1d22ed8ead..00000000000 --- a/ports/aws-c-cal/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "aws-c-cal", - "version": "0.6.9", - "description": "C99 wrapper for cryptography primitives.", - "homepage": "https://github.com/awslabs/aws-c-cal", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - { - "name": "openssl", - "platform": "!windows & !osx" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch deleted file mode 100644 index 1a0fabd4f2b..00000000000 --- a/ports/aws-c-common/disable-internal-crt-option.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake -index 470f6db..537536b 100644 ---- a/cmake/AwsCFlags.cmake -+++ b/cmake/AwsCFlags.cmake -@@ -82,15 +82,6 @@ function(aws_set_common_properties target) - list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1) - endif() - -- # Set MSVC runtime libary. -- # Note: there are other ways of doing this if we bump our CMake minimum to 3.14+ -- # See: https://cmake.org/cmake/help/latest/policy/CMP0091.html -- if (AWS_STATIC_MSVC_RUNTIME_LIBRARY OR STATIC_CRT) -- list(APPEND AWS_C_FLAGS "/MT$<$:d>") -- else() -- list(APPEND AWS_C_FLAGS "/MD$<$:d>") -- endif() -- - else() - list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) - diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake deleted file mode 100644 index e96d1a82844..00000000000 --- a/ports/aws-c-common/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-common - REF "v${VERSION}" - SHA512 f04bdc01d52b5ad191d320d352a13dd4cb9675127596c2c2229657211bc5fa3cddf05a3b395a0dc0ac5ce2f09cecf54c04b9cfacb08299e24a16a47684560f11 - HEAD_REF master - PATCHES - disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # central macros -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json deleted file mode 100644 index 9d7a14ce9cf..00000000000 --- a/ports/aws-c-common/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "aws-c-common", - "version": "0.9.10", - "description": "AWS common library for C", - "homepage": "https://github.com/awslabs/aws-c-common", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake deleted file mode 100644 index 3104c34f4b1..00000000000 --- a/ports/aws-c-compression/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-compression - REF "v${VERSION}" - SHA512 7813ae3d19336a187dd218d22748a09b397aea68f344e44ce0472490babdd7c7a4bb94d586a38d7f0c7d3b6f29502ec9ccf080b020e15fd24891ec1b3cdb4663 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json deleted file mode 100644 index 351ad87cea1..00000000000 --- a/ports/aws-c-compression/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "aws-c-compression", - "version": "0.2.17", - "description": "C99 implementation of huffman encoding/decoding", - "homepage": "https://github.com/awslabs/aws-c-compression", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake deleted file mode 100644 index e725a88532b..00000000000 --- a/ports/aws-c-event-stream/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-event-stream - REF "v${VERSION}" - SHA512 295ee4b1f647f5b15790e000cd5f0102e64ef03912c1c7378739f52229b82090384c66367c4caf8fa7f34f3275b3da71bc031cf6000053ad31d53ce075721da2 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json deleted file mode 100644 index 1c3135a5ed5..00000000000 --- a/ports/aws-c-event-stream/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "aws-c-event-stream", - "version": "0.3.2", - "description": "C99 implementation of the vnd.amazon.event-stream content-type.", - "homepage": "https://github.com/awslabs/aws-c-event-stream", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - "aws-c-io", - "aws-checksums", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake deleted file mode 100644 index a0cf2430398..00000000000 --- a/ports/aws-c-http/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-http - REF "v${VERSION}" - SHA512 205cf1cc4b766fd42cfca6ab84974e0797f2a52f8cdf64fed0c4327a2b70c251e5c9561b1cf714cbe4b7ef87092a094830071e6621bd0e0e1684b2e66ea718e2 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json deleted file mode 100644 index dcbb887aa9e..00000000000 --- a/ports/aws-c-http/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "aws-c-http", - "version": "0.7.14", - "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", - "homepage": "https://github.com/awslabs/aws-c-http", - "license": "Apache-2.0", - "supports": "!(windows & 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 - } - ] -} diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake deleted file mode 100644 index bf331bfbaa2..00000000000 --- a/ports/aws-c-io/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-io - REF "v${VERSION}" - SHA512 cb76ddf7d43c440443c6e5fb33a022f540d8ca95572f36b263836fe6bebfd0790370c84fec37b45475645167ab71bb14de320b9988803ac01f6bbb0d7436949a - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json deleted file mode 100644 index e6fc427362c..00000000000 --- a/ports/aws-c-io/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aws-c-io", - "version": "0.13.36", - "description": "Handles all IO and TLS work for application protocols.", - "homepage": "https://github.com/awslabs/aws-c-io", - "license": "Apache-2.0", - "supports": "!(windows & 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 - } - ] -} diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake deleted file mode 100644 index fd41c8328a8..00000000000 --- a/ports/aws-c-mqtt/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-mqtt - REF "v${VERSION}" - SHA512 9664596de78a8778349cf32d5dd207ed8e5a28e1d13505f942c8486c3fbf516ec49121af312d85182ebdc66b464d430fcd2d28606b1c2652a8dfb9c173334681 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json deleted file mode 100644 index 1bec811c346..00000000000 --- a/ports/aws-c-mqtt/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aws-c-mqtt", - "version": "0.9.10", - "description": "C99 implementation of the MQTT 3.1.1 specification.", - "homepage": "https://github.com/awslabs/aws-c-mqtt", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-http", - "aws-c-io", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake deleted file mode 100644 index 4b65d399949..00000000000 --- a/ports/aws-c-s3/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-s3 - REF "v${VERSION}" - SHA512 62dca71a857f7c55cb824cf1a81f3dbefa7cf7d50e5fadec5f2e67d4c2e33c2902a483145b4e9390aa5adf68ab65588c7c71e91717b74733db2a15e7a1cc5794 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json deleted file mode 100644 index 362b597c81b..00000000000 --- a/ports/aws-c-s3/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "aws-c-s3", - "version": "0.4.3", - "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", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-auth", - "aws-c-http", - "aws-c-sdkutils", - "aws-checksums", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake deleted file mode 100644 index 53ed5fdc8a0..00000000000 --- a/ports/aws-c-sdkutils/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-sdkutils - REF "v${VERSION}" - SHA512 34d5bc5190fc6890533247d304b791625f59b0f60aca972b03e00f684b37dd3b806b7c371f1f8b048a30cb9960326d1534c53874621c9630215e597ba8700685 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json deleted file mode 100644 index bb91dda4e0d..00000000000 --- a/ports/aws-c-sdkutils/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "aws-c-sdkutils", - "version": "0.1.12", - "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...", - "homepage": "https://github.com/awslabs/aws-c-sdkutils", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake deleted file mode 100644 index 07234e6ca53..00000000000 --- a/ports/aws-checksums/portfile.cmake +++ /dev/null @@ -1,39 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-checksums - REF "v${VERSION}" - SHA512 b75f5442db9a61f8856756c4a784339fd446effca0cdb02c67e51ce9f14ea76f5ca94d29a69f2a452c63c868598489343ec1d097432a8a0159868731422cfbf4 - HEAD_REF master -) - -if (VCPKG_CRT_LINKAGE STREQUAL static) - set(STATIC_CRT_LNK ON) -else() - set(STATIC_CRT_LNK OFF) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSTATIC_CRT=${STATIC_CRT_LNK} - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json deleted file mode 100644 index c915c21576c..00000000000 --- a/ports/aws-checksums/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "aws-checksums", - "version": "0.1.17", - "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", - "homepage": "https://github.com/awslabs/aws-checksums", - "license": "Apache-2.0", - "supports": "!(windows & arm)", - "dependencies": [ - "aws-c-common", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-crt-cpp/no-werror.patch b/ports/aws-crt-cpp/no-werror.patch deleted file mode 100644 index 27b7c8f8ab6..00000000000 --- a/ports/aws-crt-cpp/no-werror.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision f2adef31d778cfe90b8a5bb377425f825ebf92f0) -+++ b/CMakeLists.txt (date 1675009099302) -@@ -337,9 +337,9 @@ - # set extra warning flags - if(AWS_WARNINGS_ARE_ERRORS) - if(MSVC) -- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068) -+ target_compile_options(${PROJECT_NAME} PRIVATE /W4 /wd4068) - else() -- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) -+ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic) - endif() - endif() - diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake deleted file mode 100644 index 553fc30c902..00000000000 --- a/ports/aws-crt-cpp/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-crt-cpp - REF "v${VERSION}" - SHA512 4160aae9aaf98556d9fd26a13feb09f7fce2a20e073740d13ab9890fdab158de63918c8fd2f4a2d07e92798e2df47b6696b38e614c9631ebcdddf7ea1c44a126 - PATCHES - no-werror.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() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json deleted file mode 100644 index a211574cd57..00000000000 --- a/ports/aws-crt-cpp/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "aws-crt-cpp", - "version": "0.24.8", - "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", - "homepage": "https://github.com/awslabs/aws-crt-cpp", - "license": "Apache-2.0", - "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 - } - ] -} diff --git a/ports/aws-sdk-cpp/fix-aws-root.patch b/ports/aws-sdk-cpp/fix-aws-root.patch deleted file mode 100644 index da4365ad721..00000000000 --- a/ports/aws-sdk-cpp/fix-aws-root.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake ---- a/cmake/AWSSDKConfig.cmake (revision 2f90f9fd6c56460bd382243aa215fcddcb5883c8) -+++ b/cmake/AWSSDKConfig.cmake (date 1636913220527) -@@ -54,18 +54,14 @@ - string(REPLACE ";" "${AWS_MODULE_DIR};" SYSTEM_MODULE_PATH "${CMAKE_SYSTEM_PREFIX_PATH}${AWS_MODULE_DIR}") - list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH} ${SYSTEM_MODULE_PATH}) - --# 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() - - - # Compute the default installation root relative to this file. --# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix - 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) diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 deleted file mode 100644 index d0f9a5aba72..00000000000 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ /dev/null @@ -1,73 +0,0 @@ -[CmdletBinding()] -param( - [Parameter(Mandatory=$true)][string]$SourcesRef, - [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, - [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" -) - -$ErrorActionPreference = "Stop" - -$ManifestIn = "$PortDirectory/vcpkg.in.json" -$ManifestOut = "$PortDirectory/vcpkg.json" - -$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" -if (-not (Test-Path $ExtractedSources)) { - if (Test-Path "$ExtractedSources.tmp") { - Remove-Item -Force "$ExtractedSources.tmp" - } - git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host - git -c "$ExtractedSources.tmp" checkout $SourcesRef - Move-Item "$ExtractedSources.tmp" "$ExtractedSources" -} -Write-Host "Using sources directory: $ExtractedSources" - - -$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name - -$manifest = Get-Content $ManifestIn | ConvertFrom-Json -$manifest | Add-Member ` - -NotePropertyName '$note' ` - -NotePropertyValue 'Automatically generated by generateFeatures.ps1' -$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} - -function GetDescription($dir, $modulename) -{ - if (Test-Path "$dir\CMakeLists.txt") - { - $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") - if ($descs.count -eq 1) { - $desc = $descs[0].Matches.Value -replace "`"","" - "$desc" - } - else { "C++ SDK for the AWS $modulename service" } - } - else { "C++ SDK for the AWS $modulename service" } -} - -$featureDependencies = @{} -Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` -| ForEach-Object { $_.Matches } ` -| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` -| Where-Object { $_ -ne "core" }) } - -foreach ($subfolder in $subfolders) -{ - $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" - if ($modulename -match "-tests`$") { continue } - if ($modulename -match "-sample`$") { continue } - if ($modulename -eq "core") { continue } - - $lowermodulename = $modulename.ToLower() - - $featureObj = @{ description = (GetDescription $subfolder $modulename) } - - if ($featureDependencies.ContainsKey($lowermodulename)) { - $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } - } - - $manifest.features.Add("$lowermodulename", $featureObj) -} - -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) - -& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut diff --git a/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch b/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch deleted file mode 100644 index 0f7a3b19183..00000000000 --- a/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLists.txt -index c44546b0e..b66888362 100644 ---- a/src/aws-cpp-sdk-core/CMakeLists.txt -+++ b/src/aws-cpp-sdk-core/CMakeLists.txt -@@ -113,13 +113,8 @@ if(ENABLE_CURL_CLIENT) - int main() { - CURL* handle = curl_easy_init(); - return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }") -- if (CMAKE_CROSSCOMPILING) -- check_c_source_compiles("${CHECK_CURL_HAS_H2}" CURL_HAS_H2) -- check_c_source_compiles("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY) -- else() -- check_c_source_runs("${CHECK_CURL_HAS_H2}" CURL_HAS_H2) -- check_c_source_runs("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY) -- endif() -+ set(CURL_HAS_H2 OFF) -+ set(CURL_HAS_TLS_PROXY ON) - elseif(ENABLE_WINDOWS_CLIENT) - # NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2 - if(USE_IXML_HTTP_REQUEST_2) diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch deleted file mode 100644 index 7d68126be59..00000000000 --- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41d220d5fa..f6ee9a2a74 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,7 +147,6 @@ if (LEGACY_BUILD) - endif () - - # 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 the sdk targets - project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake deleted file mode 100644 index 1dc66c5f4b3..00000000000 --- a/ports/aws-sdk-cpp/portfile.cmake +++ /dev/null @@ -1,100 +0,0 @@ -vcpkg_buildpath_length_warning(37) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO aws/aws-sdk-cpp - REF "${VERSION}" - SHA512 4410eaff815ce7b6c0bc0d37bd4175754d5103d2e3cfd60755df57dad103ab7e7705b79fc6039d2c8b7d1ccec650912f5ff0aa73baa2d9cf6d6608a493d11088 - PATCHES - patch-relocatable-rpath.patch - fix-aws-root.patch - lock-curl-http-and-tls-settings.patch - fix-awsmigrationhub-build.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) - -set(EXTRA_ARGS) -if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) - set(rpath "@loader_path") -elseif (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=--invalid-git-executable--" - "-DGIT_FOUND=TRUE" - "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" - "-DANDROID_BUILD_ZLIB=FALSE" - "-DANDROID_BUILD_CURL=FALSE" - "-DANDROID_BUILD_OPENSSL=FALSE" - ) -else() - set(rpath "\$ORIGIN") -endif() - -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=${FEATURES}" - "-DBUILD_DEPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DAWS_SDK_WARNINGS_ARE_ERRORS=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 FEATURES) - 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) - file(READ ${AWS_TARGET} _contents) - string(REGEX REPLACE - "bin\\/([A-Za-z0-9_.-]+\\.lib)" - "lib/\\1" - _contents "${_contents}") - file(WRITE ${AWS_TARGET} "${_contents}") -endforeach() - -file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") -list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") -foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) - file(READ "${AWS_CONFIG}" _contents) - file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") -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" -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) - if(LIB_FILES) - file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(REMOVE ${LIB_FILES}) - endif() - file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) - if(DEBUG_LIB_FILES) - file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - 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") -endif() - -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage deleted file mode 100644 index 37e1f617b2c..00000000000 --- a/ports/aws-sdk-cpp/usage +++ /dev/null @@ -1,12 +0,0 @@ -The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - - When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. - find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) - target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) - - OR - - find_package(aws-cpp-sdk-core REQUIRED) - target_include_directories(main PRIVATE aws-cpp-sdk-core) - target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json deleted file mode 100644 index e79a583786b..00000000000 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "aws-sdk-cpp", - "version": "1.11.215", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ] -} diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json deleted file mode 100644 index 745435741aa..00000000000 --- a/ports/aws-sdk-cpp/vcpkg.json +++ /dev/null @@ -1,1183 +0,0 @@ -{ - "$note": "Automatically generated by generateFeatures.ps1", - "name": "aws-sdk-cpp", - "version": "1.11.215", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ], - "features": { - "access-management": { - "description": "C++ SDK for the AWS access-management service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "cognito-identity", - "iam" - ] - } - ] - }, - "accessanalyzer": { - "description": "C++ SDK for the AWS accessanalyzer service" - }, - "account": { - "description": "C++ SDK for the AWS account service" - }, - "acm": { - "description": "C++ SDK for the AWS acm service" - }, - "acm-pca": { - "description": "C++ SDK for the AWS acm-pca service" - }, - "alexaforbusiness": { - "description": "C++ SDK for the AWS alexaforbusiness service" - }, - "amp": { - "description": "C++ SDK for the AWS amp service" - }, - "amplify": { - "description": "C++ SDK for the AWS amplify service" - }, - "amplifybackend": { - "description": "C++ SDK for the AWS amplifybackend service" - }, - "amplifyuibuilder": { - "description": "C++ SDK for the AWS amplifyuibuilder service" - }, - "apigateway": { - "description": "C++ SDK for the AWS apigateway service" - }, - "apigatewaymanagementapi": { - "description": "C++ SDK for the AWS apigatewaymanagementapi service" - }, - "apigatewayv2": { - "description": "C++ SDK for the AWS apigatewayv2 service" - }, - "appconfig": { - "description": "C++ SDK for the AWS appconfig service" - }, - "appconfigdata": { - "description": "C++ SDK for the AWS appconfigdata service" - }, - "appfabric": { - "description": "C++ SDK for the AWS appfabric service" - }, - "appflow": { - "description": "C++ SDK for the AWS appflow service" - }, - "appintegrations": { - "description": "C++ SDK for the AWS appintegrations service" - }, - "application-autoscaling": { - "description": "C++ SDK for the AWS application-autoscaling service" - }, - "application-insights": { - "description": "C++ SDK for the AWS application-insights service" - }, - "applicationcostprofiler": { - "description": "C++ SDK for the AWS applicationcostprofiler service" - }, - "appmesh": { - "description": "C++ SDK for the AWS appmesh service" - }, - "apprunner": { - "description": "C++ SDK for the AWS apprunner service" - }, - "appstream": { - "description": "C++ SDK for the AWS appstream service" - }, - "appsync": { - "description": "C++ SDK for the AWS appsync service" - }, - "arc-zonal-shift": { - "description": "C++ SDK for the AWS arc-zonal-shift service" - }, - "athena": { - "description": "C++ SDK for the AWS athena service" - }, - "auditmanager": { - "description": "C++ SDK for the AWS auditmanager service" - }, - "autoscaling": { - "description": "C++ SDK for the AWS autoscaling service" - }, - "autoscaling-plans": { - "description": "C++ SDK for the AWS autoscaling-plans service" - }, - "awsmigrationhub": { - "description": "C++ SDK for the AWS AWSMigrationHub service" - }, - "awstransfer": { - "description": "C++ SDK for the AWS awstransfer service" - }, - "backup": { - "description": "C++ SDK for the AWS backup service" - }, - "backup-gateway": { - "description": "C++ SDK for the AWS backup-gateway service" - }, - "backupstorage": { - "description": "C++ SDK for the AWS backupstorage service" - }, - "batch": { - "description": "C++ SDK for the AWS batch service" - }, - "billingconductor": { - "description": "C++ SDK for the AWS billingconductor service" - }, - "braket": { - "description": "C++ SDK for the AWS braket service" - }, - "budgets": { - "description": "C++ SDK for the AWS budgets service" - }, - "ce": { - "description": "C++ SDK for the AWS ce service" - }, - "chime": { - "description": "C++ SDK for the AWS chime service" - }, - "chime-sdk-identity": { - "description": "C++ SDK for the AWS chime-sdk-identity service" - }, - "chime-sdk-media-pipelines": { - "description": "C++ SDK for the AWS chime-sdk-media-pipelines service" - }, - "chime-sdk-meetings": { - "description": "C++ SDK for the AWS chime-sdk-meetings service" - }, - "chime-sdk-messaging": { - "description": "C++ SDK for the AWS chime-sdk-messaging service" - }, - "chime-sdk-voice": { - "description": "C++ SDK for the AWS chime-sdk-voice service" - }, - "cleanrooms": { - "description": "C++ SDK for the AWS cleanrooms service" - }, - "cloud9": { - "description": "C++ SDK for the AWS cloud9 service" - }, - "cloudcontrol": { - "description": "C++ SDK for the AWS cloudcontrol service" - }, - "clouddirectory": { - "description": "C++ SDK for the AWS clouddirectory service" - }, - "cloudformation": { - "description": "C++ SDK for the AWS cloudformation service" - }, - "cloudfront": { - "description": "C++ SDK for the AWS cloudfront service" - }, - "cloudhsm": { - "description": "C++ SDK for the AWS cloudhsm service" - }, - "cloudhsmv2": { - "description": "C++ SDK for the AWS cloudhsmv2 service" - }, - "cloudsearch": { - "description": "C++ SDK for the AWS cloudsearch service" - }, - "cloudsearchdomain": { - "description": "C++ SDK for the AWS cloudsearchdomain service" - }, - "cloudtrail": { - "description": "C++ SDK for the AWS cloudtrail service" - }, - "cloudtrail-data": { - "description": "C++ SDK for the AWS cloudtrail-data service" - }, - "codeartifact": { - "description": "C++ SDK for the AWS codeartifact service" - }, - "codebuild": { - "description": "C++ SDK for the AWS codebuild service" - }, - "codecatalyst": { - "description": "C++ SDK for the AWS codecatalyst service" - }, - "codecommit": { - "description": "C++ SDK for the AWS codecommit service" - }, - "codedeploy": { - "description": "C++ SDK for the AWS codedeploy service" - }, - "codeguru-reviewer": { - "description": "C++ SDK for the AWS codeguru-reviewer service" - }, - "codeguru-security": { - "description": "C++ SDK for the AWS codeguru-security service" - }, - "codeguruprofiler": { - "description": "C++ SDK for the AWS codeguruprofiler service" - }, - "codepipeline": { - "description": "C++ SDK for the AWS codepipeline service" - }, - "codestar": { - "description": "C++ SDK for the AWS codestar service" - }, - "codestar-connections": { - "description": "C++ SDK for the AWS codestar-connections service" - }, - "codestar-notifications": { - "description": "C++ SDK for the AWS codestar-notifications service" - }, - "cognito-identity": { - "description": "C++ SDK for the AWS cognito-identity service" - }, - "cognito-idp": { - "description": "C++ SDK for the AWS cognito-idp service" - }, - "cognito-sync": { - "description": "C++ SDK for the AWS cognito-sync service" - }, - "comprehend": { - "description": "C++ SDK for the AWS comprehend service" - }, - "comprehendmedical": { - "description": "C++ SDK for the AWS comprehendmedical service" - }, - "compute-optimizer": { - "description": "C++ SDK for the AWS compute-optimizer service" - }, - "config": { - "description": "C++ SDK for the AWS config service" - }, - "connect": { - "description": "C++ SDK for the AWS connect service" - }, - "connect-contact-lens": { - "description": "C++ SDK for the AWS connect-contact-lens service" - }, - "connectcampaigns": { - "description": "C++ SDK for the AWS connectcampaigns service" - }, - "connectcases": { - "description": "C++ SDK for the AWS connectcases service" - }, - "connectparticipant": { - "description": "C++ SDK for the AWS connectparticipant service" - }, - "controltower": { - "description": "C++ SDK for the AWS controltower service" - }, - "cur": { - "description": "C++ SDK for the AWS cur service" - }, - "customer-profiles": { - "description": "C++ SDK for the AWS customer-profiles service" - }, - "databrew": { - "description": "C++ SDK for the AWS databrew service" - }, - "dataexchange": { - "description": "C++ SDK for the AWS dataexchange service" - }, - "datapipeline": { - "description": "C++ SDK for the AWS datapipeline service" - }, - "datasync": { - "description": "C++ SDK for the AWS datasync service" - }, - "dax": { - "description": "C++ SDK for the AWS dax service" - }, - "detective": { - "description": "C++ SDK for the AWS detective service" - }, - "devicefarm": { - "description": "C++ SDK for the AWS devicefarm service" - }, - "devops-guru": { - "description": "C++ SDK for the AWS devops-guru service" - }, - "directconnect": { - "description": "C++ SDK for the AWS directconnect service" - }, - "discovery": { - "description": "C++ SDK for the AWS discovery service" - }, - "dlm": { - "description": "C++ SDK for the AWS dlm service" - }, - "dms": { - "description": "C++ SDK for the AWS dms service" - }, - "docdb": { - "description": "C++ SDK for the AWS docdb service" - }, - "docdb-elastic": { - "description": "C++ SDK for the AWS docdb-elastic service" - }, - "drs": { - "description": "C++ SDK for the AWS drs service" - }, - "ds": { - "description": "C++ SDK for the AWS ds service" - }, - "dynamodb": { - "description": "C++ SDK for the AWS dynamodb service" - }, - "dynamodbstreams": { - "description": "C++ SDK for the AWS dynamodbstreams service" - }, - "ebs": { - "description": "C++ SDK for the AWS ebs service" - }, - "ec2": { - "description": "C++ SDK for the AWS ec2 service" - }, - "ec2-instance-connect": { - "description": "C++ SDK for the AWS ec2-instance-connect service" - }, - "ecr": { - "description": "C++ SDK for the AWS ecr service" - }, - "ecr-public": { - "description": "C++ SDK for the AWS ecr-public service" - }, - "ecs": { - "description": "C++ SDK for the AWS ecs service" - }, - "eks": { - "description": "C++ SDK for the AWS eks service" - }, - "elastic-inference": { - "description": "C++ SDK for the AWS elastic-inference service" - }, - "elasticache": { - "description": "C++ SDK for the AWS elasticache service" - }, - "elasticbeanstalk": { - "description": "C++ SDK for the AWS elasticbeanstalk service" - }, - "elasticfilesystem": { - "description": "C++ SDK for the AWS elasticfilesystem service" - }, - "elasticloadbalancing": { - "description": "C++ SDK for the AWS elasticloadbalancing service" - }, - "elasticloadbalancingv2": { - "description": "C++ SDK for the AWS elasticloadbalancingv2 service" - }, - "elasticmapreduce": { - "description": "C++ SDK for the AWS elasticmapreduce service" - }, - "elastictranscoder": { - "description": "C++ SDK for the AWS elastictranscoder service" - }, - "email": { - "description": "C++ SDK for the AWS email service" - }, - "emr-containers": { - "description": "C++ SDK for the AWS emr-containers service" - }, - "emr-serverless": { - "description": "C++ SDK for the AWS emr-serverless service" - }, - "entityresolution": { - "description": "C++ SDK for the AWS entityresolution service" - }, - "es": { - "description": "C++ SDK for the AWS es service" - }, - "eventbridge": { - "description": "C++ SDK for the AWS eventbridge service" - }, - "events": { - "description": "C++ SDK for the AWS events service" - }, - "evidently": { - "description": "C++ SDK for the AWS evidently service" - }, - "finspace": { - "description": "C++ SDK for the AWS finspace service" - }, - "finspace-data": { - "description": "C++ SDK for the AWS finspace-data service" - }, - "firehose": { - "description": "C++ SDK for the AWS firehose service" - }, - "fis": { - "description": "C++ SDK for the AWS fis service" - }, - "fms": { - "description": "C++ SDK for the AWS fms service" - }, - "forecast": { - "description": "C++ SDK for the AWS forecast service" - }, - "forecastquery": { - "description": "C++ SDK for the AWS forecastquery service" - }, - "frauddetector": { - "description": "C++ SDK for the AWS frauddetector service" - }, - "fsx": { - "description": "C++ SDK for the AWS fsx service" - }, - "gamelift": { - "description": "C++ SDK for the AWS gamelift service" - }, - "glacier": { - "description": "C++ SDK for the AWS glacier service" - }, - "globalaccelerator": { - "description": "C++ SDK for the AWS globalaccelerator service" - }, - "glue": { - "description": "C++ SDK for the AWS glue service" - }, - "grafana": { - "description": "C++ SDK for the AWS grafana service" - }, - "greengrass": { - "description": "C++ SDK for the AWS greengrass service" - }, - "greengrassv2": { - "description": "C++ SDK for the AWS greengrassv2 service" - }, - "groundstation": { - "description": "C++ SDK for the AWS groundstation service" - }, - "guardduty": { - "description": "C++ SDK for the AWS guardduty service" - }, - "health": { - "description": "C++ SDK for the AWS health service" - }, - "healthlake": { - "description": "C++ SDK for the AWS healthlake service" - }, - "honeycode": { - "description": "C++ SDK for the AWS honeycode service" - }, - "iam": { - "description": "C++ SDK for the AWS iam service" - }, - "identity-management": { - "description": "C++ SDK for the AWS identity-management service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "cognito-identity", - "sts" - ] - } - ] - }, - "identitystore": { - "description": "C++ SDK for the AWS identitystore service" - }, - "imagebuilder": { - "description": "C++ SDK for the AWS imagebuilder service" - }, - "importexport": { - "description": "C++ SDK for the AWS importexport service" - }, - "inspector": { - "description": "C++ SDK for the AWS inspector service" - }, - "inspector2": { - "description": "C++ SDK for the AWS inspector2 service" - }, - "internetmonitor": { - "description": "C++ SDK for the AWS internetmonitor service" - }, - "iot": { - "description": "C++ SDK for the AWS iot service" - }, - "iot-data": { - "description": "C++ SDK for the AWS iot-data service" - }, - "iot-jobs-data": { - "description": "C++ SDK for the AWS iot-jobs-data service" - }, - "iot-roborunner": { - "description": "C++ SDK for the AWS iot-roborunner service" - }, - "iot1click-devices": { - "description": "C++ SDK for the AWS iot1click-devices service" - }, - "iot1click-projects": { - "description": "C++ SDK for the AWS iot1click-projects service" - }, - "iotanalytics": { - "description": "C++ SDK for the AWS iotanalytics service" - }, - "iotdeviceadvisor": { - "description": "C++ SDK for the AWS iotdeviceadvisor service" - }, - "iotevents": { - "description": "C++ SDK for the AWS iotevents service" - }, - "iotevents-data": { - "description": "C++ SDK for the AWS iotevents-data service" - }, - "iotfleethub": { - "description": "C++ SDK for the AWS iotfleethub service" - }, - "iotfleetwise": { - "description": "C++ SDK for the AWS iotfleetwise service" - }, - "iotsecuretunneling": { - "description": "C++ SDK for the AWS iotsecuretunneling service" - }, - "iotsitewise": { - "description": "C++ SDK for the AWS iotsitewise service" - }, - "iotthingsgraph": { - "description": "C++ SDK for the AWS iotthingsgraph service" - }, - "iottwinmaker": { - "description": "C++ SDK for the AWS iottwinmaker service" - }, - "iotwireless": { - "description": "C++ SDK for the AWS iotwireless service" - }, - "ivs": { - "description": "C++ SDK for the AWS ivs service" - }, - "ivs-realtime": { - "description": "C++ SDK for the AWS ivs-realtime service" - }, - "ivschat": { - "description": "C++ SDK for the AWS ivschat service" - }, - "kafka": { - "description": "C++ SDK for the AWS kafka service" - }, - "kafkaconnect": { - "description": "C++ SDK for the AWS kafkaconnect service" - }, - "kendra": { - "description": "C++ SDK for the AWS kendra service" - }, - "kendra-ranking": { - "description": "C++ SDK for the AWS kendra-ranking service" - }, - "keyspaces": { - "description": "C++ SDK for the AWS keyspaces service" - }, - "kinesis": { - "description": "C++ SDK for the AWS kinesis service" - }, - "kinesis-video-archived-media": { - "description": "C++ SDK for the AWS kinesis-video-archived-media service" - }, - "kinesis-video-media": { - "description": "C++ SDK for the AWS kinesis-video-media service" - }, - "kinesis-video-signaling": { - "description": "C++ SDK for the AWS kinesis-video-signaling service" - }, - "kinesis-video-webrtc-storage": { - "description": "C++ SDK for the AWS kinesis-video-webrtc-storage service" - }, - "kinesisanalytics": { - "description": "C++ SDK for the AWS kinesisanalytics service" - }, - "kinesisanalyticsv2": { - "description": "C++ SDK for the AWS kinesisanalyticsv2 service" - }, - "kinesisvideo": { - "description": "C++ SDK for the AWS kinesisvideo service" - }, - "kms": { - "description": "C++ SDK for the AWS kms service" - }, - "lakeformation": { - "description": "C++ SDK for the AWS lakeformation service" - }, - "lambda": { - "description": "C++ SDK for the AWS lambda service" - }, - "lex": { - "description": "C++ SDK for the AWS lex service" - }, - "lex-models": { - "description": "C++ SDK for the AWS lex-models service" - }, - "lexv2-models": { - "description": "C++ SDK for the AWS lexv2-models service" - }, - "lexv2-runtime": { - "description": "C++ SDK for the AWS lexv2-runtime service" - }, - "license-manager": { - "description": "C++ SDK for the AWS license-manager service" - }, - "license-manager-linux-subscriptions": { - "description": "C++ SDK for the AWS license-manager-linux-subscriptions service" - }, - "license-manager-user-subscriptions": { - "description": "C++ SDK for the AWS license-manager-user-subscriptions service" - }, - "lightsail": { - "description": "C++ SDK for the AWS lightsail service" - }, - "location": { - "description": "C++ SDK for the AWS location service" - }, - "logs": { - "description": "C++ SDK for the AWS logs service" - }, - "lookoutequipment": { - "description": "C++ SDK for the AWS lookoutequipment service" - }, - "lookoutmetrics": { - "description": "C++ SDK for the AWS lookoutmetrics service" - }, - "lookoutvision": { - "description": "C++ SDK for the AWS lookoutvision service" - }, - "m2": { - "description": "C++ SDK for the AWS m2 service" - }, - "machinelearning": { - "description": "C++ SDK for the AWS machinelearning service" - }, - "macie": { - "description": "C++ SDK for the AWS macie service" - }, - "macie2": { - "description": "C++ SDK for the AWS macie2 service" - }, - "managedblockchain": { - "description": "C++ SDK for the AWS managedblockchain service" - }, - "managedblockchain-query": { - "description": "C++ SDK for the AWS managedblockchain-query service" - }, - "marketplace-catalog": { - "description": "C++ SDK for the AWS marketplace-catalog service" - }, - "marketplace-entitlement": { - "description": "C++ SDK for the AWS marketplace-entitlement service" - }, - "marketplacecommerceanalytics": { - "description": "C++ SDK for the AWS marketplacecommerceanalytics service" - }, - "mediaconnect": { - "description": "C++ SDK for the AWS mediaconnect service" - }, - "mediaconvert": { - "description": "C++ SDK for the AWS mediaconvert service" - }, - "medialive": { - "description": "C++ SDK for the AWS medialive service" - }, - "mediapackage": { - "description": "C++ SDK for the AWS mediapackage service" - }, - "mediapackage-vod": { - "description": "C++ SDK for the AWS mediapackage-vod service" - }, - "mediapackagev2": { - "description": "C++ SDK for the AWS mediapackagev2 service" - }, - "mediastore": { - "description": "C++ SDK for the AWS mediastore service" - }, - "mediastore-data": { - "description": "C++ SDK for the AWS mediastore-data service" - }, - "mediatailor": { - "description": "C++ SDK for the AWS mediatailor service" - }, - "medical-imaging": { - "description": "C++ SDK for the AWS medical-imaging service" - }, - "memorydb": { - "description": "C++ SDK for the AWS memorydb service" - }, - "meteringmarketplace": { - "description": "C++ SDK for the AWS meteringmarketplace service" - }, - "mgn": { - "description": "C++ SDK for the AWS mgn service" - }, - "migration-hub-refactor-spaces": { - "description": "C++ SDK for the AWS migration-hub-refactor-spaces service" - }, - "migrationhub-config": { - "description": "C++ SDK for the AWS migrationhub-config service" - }, - "migrationhuborchestrator": { - "description": "C++ SDK for the AWS migrationhuborchestrator service" - }, - "migrationhubstrategy": { - "description": "C++ SDK for the AWS migrationhubstrategy service" - }, - "mobile": { - "description": "C++ SDK for the AWS mobile service" - }, - "monitoring": { - "description": "C++ SDK for the AWS monitoring service" - }, - "mq": { - "description": "C++ SDK for the AWS mq service" - }, - "mturk-requester": { - "description": "C++ SDK for the AWS mturk-requester service" - }, - "mwaa": { - "description": "C++ SDK for the AWS mwaa service" - }, - "neptune": { - "description": "C++ SDK for the AWS neptune service" - }, - "neptunedata": { - "description": "C++ SDK for the AWS neptunedata service" - }, - "network-firewall": { - "description": "C++ SDK for the AWS network-firewall service" - }, - "networkmanager": { - "description": "C++ SDK for the AWS networkmanager service" - }, - "nimble": { - "description": "C++ SDK for the AWS nimble service" - }, - "oam": { - "description": "C++ SDK for the AWS oam service" - }, - "omics": { - "description": "C++ SDK for the AWS omics service" - }, - "opensearch": { - "description": "C++ SDK for the AWS opensearch service" - }, - "opensearchserverless": { - "description": "C++ SDK for the AWS opensearchserverless service" - }, - "opsworks": { - "description": "C++ SDK for the AWS opsworks service" - }, - "opsworkscm": { - "description": "C++ SDK for the AWS opsworkscm service" - }, - "organizations": { - "description": "C++ SDK for the AWS organizations service" - }, - "osis": { - "description": "C++ SDK for the AWS osis service" - }, - "outposts": { - "description": "C++ SDK for the AWS outposts service" - }, - "panorama": { - "description": "C++ SDK for the AWS panorama service" - }, - "payment-cryptography": { - "description": "C++ SDK for the AWS payment-cryptography service" - }, - "payment-cryptography-data": { - "description": "C++ SDK for the AWS payment-cryptography-data service" - }, - "pca-connector-ad": { - "description": "C++ SDK for the AWS pca-connector-ad service" - }, - "personalize": { - "description": "C++ SDK for the AWS personalize service" - }, - "personalize-events": { - "description": "C++ SDK for the AWS personalize-events service" - }, - "personalize-runtime": { - "description": "C++ SDK for the AWS personalize-runtime service" - }, - "pi": { - "description": "C++ SDK for the AWS pi service" - }, - "pinpoint": { - "description": "C++ SDK for the AWS pinpoint service" - }, - "pinpoint-email": { - "description": "C++ SDK for the AWS pinpoint-email service" - }, - "pinpoint-sms-voice-v2": { - "description": "C++ SDK for the AWS pinpoint-sms-voice-v2 service" - }, - "pipes": { - "description": "C++ SDK for the AWS pipes service" - }, - "polly": { - "description": "C++ SDK for the AWS polly service" - }, - "pricing": { - "description": "C++ SDK for the AWS pricing service" - }, - "privatenetworks": { - "description": "C++ SDK for the AWS privatenetworks service" - }, - "proton": { - "description": "C++ SDK for the AWS proton service" - }, - "qldb": { - "description": "C++ SDK for the AWS qldb service" - }, - "qldb-session": { - "description": "C++ SDK for the AWS qldb-session service" - }, - "queues": { - "description": "C++ SDK for the AWS queues service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "sqs" - ] - } - ] - }, - "quicksight": { - "description": "C++ SDK for the AWS quicksight service" - }, - "ram": { - "description": "C++ SDK for the AWS ram service" - }, - "rbin": { - "description": "C++ SDK for the AWS rbin service" - }, - "rds": { - "description": "C++ SDK for the AWS rds service" - }, - "rds-data": { - "description": "C++ SDK for the AWS rds-data service" - }, - "redshift": { - "description": "C++ SDK for the AWS redshift service" - }, - "redshift-data": { - "description": "C++ SDK for the AWS redshift-data service" - }, - "redshift-serverless": { - "description": "C++ SDK for the AWS redshift-serverless service" - }, - "rekognition": { - "description": "C++ SDK for the AWS rekognition service" - }, - "resiliencehub": { - "description": "C++ SDK for the AWS resiliencehub service" - }, - "resource-explorer-2": { - "description": "C++ SDK for the AWS resource-explorer-2 service" - }, - "resource-groups": { - "description": "C++ SDK for the AWS resource-groups service" - }, - "resourcegroupstaggingapi": { - "description": "C++ SDK for the AWS resourcegroupstaggingapi service" - }, - "robomaker": { - "description": "C++ SDK for the AWS robomaker service" - }, - "rolesanywhere": { - "description": "C++ SDK for the AWS rolesanywhere service" - }, - "route53": { - "description": "C++ SDK for the AWS route53 service" - }, - "route53-recovery-cluster": { - "description": "C++ SDK for the AWS route53-recovery-cluster service" - }, - "route53-recovery-control-config": { - "description": "C++ SDK for the AWS route53-recovery-control-config service" - }, - "route53-recovery-readiness": { - "description": "C++ SDK for the AWS route53-recovery-readiness service" - }, - "route53domains": { - "description": "C++ SDK for the AWS route53domains service" - }, - "route53resolver": { - "description": "C++ SDK for the AWS route53resolver service" - }, - "rum": { - "description": "C++ SDK for the AWS rum service" - }, - "s3": { - "description": "C++ SDK for the AWS s3 service" - }, - "s3-crt": { - "description": "C++ SDK for the AWS s3-crt service" - }, - "s3-encryption": { - "description": "C++ SDK for the AWS s3-encryption service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "kms", - "s3" - ] - } - ] - }, - "s3control": { - "description": "C++ SDK for the AWS s3control service" - }, - "s3outposts": { - "description": "C++ SDK for the AWS s3outposts service" - }, - "sagemaker": { - "description": "C++ SDK for the AWS sagemaker service" - }, - "sagemaker-a2i-runtime": { - "description": "C++ SDK for the AWS sagemaker-a2i-runtime service" - }, - "sagemaker-edge": { - "description": "C++ SDK for the AWS sagemaker-edge service" - }, - "sagemaker-featurestore-runtime": { - "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service" - }, - "sagemaker-geospatial": { - "description": "C++ SDK for the AWS sagemaker-geospatial service" - }, - "sagemaker-metrics": { - "description": "C++ SDK for the AWS sagemaker-metrics service" - }, - "sagemaker-runtime": { - "description": "C++ SDK for the AWS sagemaker-runtime service" - }, - "savingsplans": { - "description": "C++ SDK for the AWS savingsplans service" - }, - "scheduler": { - "description": "C++ SDK for the AWS scheduler service" - }, - "schemas": { - "description": "C++ SDK for the AWS schemas service" - }, - "sdb": { - "description": "C++ SDK for the AWS sdb service" - }, - "secretsmanager": { - "description": "C++ SDK for the AWS secretsmanager service" - }, - "securityhub": { - "description": "C++ SDK for the AWS securityhub service" - }, - "securitylake": { - "description": "C++ SDK for the AWS securitylake service" - }, - "serverlessrepo": { - "description": "C++ SDK for the AWS serverlessrepo service" - }, - "service-quotas": { - "description": "C++ SDK for the AWS service-quotas service" - }, - "servicecatalog": { - "description": "C++ SDK for the AWS servicecatalog service" - }, - "servicecatalog-appregistry": { - "description": "C++ SDK for the AWS servicecatalog-appregistry service" - }, - "servicediscovery": { - "description": "C++ SDK for the AWS servicediscovery service" - }, - "sesv2": { - "description": "C++ SDK for the AWS sesv2 service" - }, - "shield": { - "description": "C++ SDK for the AWS shield service" - }, - "signer": { - "description": "C++ SDK for the AWS signer service" - }, - "simspaceweaver": { - "description": "C++ SDK for the AWS simspaceweaver service" - }, - "sms": { - "description": "C++ SDK for the AWS sms service" - }, - "sms-voice": { - "description": "C++ SDK for the AWS sms-voice service" - }, - "snow-device-management": { - "description": "C++ SDK for the AWS snow-device-management service" - }, - "snowball": { - "description": "C++ SDK for the AWS snowball service" - }, - "sns": { - "description": "C++ SDK for the AWS sns service" - }, - "sqs": { - "description": "C++ SDK for the AWS sqs service" - }, - "ssm": { - "description": "C++ SDK for the AWS ssm service" - }, - "ssm-contacts": { - "description": "C++ SDK for the AWS ssm-contacts service" - }, - "ssm-incidents": { - "description": "C++ SDK for the AWS ssm-incidents service" - }, - "ssm-sap": { - "description": "C++ SDK for the AWS ssm-sap service" - }, - "sso": { - "description": "C++ SDK for the AWS sso service" - }, - "sso-admin": { - "description": "C++ SDK for the AWS sso-admin service" - }, - "sso-oidc": { - "description": "C++ SDK for the AWS sso-oidc service" - }, - "states": { - "description": "C++ SDK for the AWS states service" - }, - "storagegateway": { - "description": "C++ SDK for the AWS storagegateway service" - }, - "sts": { - "description": "C++ SDK for the AWS sts service" - }, - "support": { - "description": "C++ SDK for the AWS support service" - }, - "support-app": { - "description": "C++ SDK for the AWS support-app service" - }, - "swf": { - "description": "C++ SDK for the AWS swf service" - }, - "synthetics": { - "description": "C++ SDK for the AWS synthetics service" - }, - "text-to-speech": { - "description": "C++ SDK for the AWS text-to-speech service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "polly" - ] - } - ] - }, - "textract": { - "description": "C++ SDK for the AWS textract service" - }, - "timestream-query": { - "description": "C++ SDK for the AWS timestream-query service" - }, - "timestream-write": { - "description": "C++ SDK for the AWS timestream-write service" - }, - "tnb": { - "description": "C++ SDK for the AWS tnb service" - }, - "transcribe": { - "description": "C++ SDK for the AWS transcribe service" - }, - "transcribestreaming": { - "description": "C++ SDK for the AWS transcribestreaming service" - }, - "transfer": { - "description": "C++ SDK for the AWS transfer service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "s3" - ] - } - ] - }, - "translate": { - "description": "C++ SDK for the AWS translate service" - }, - "verifiedpermissions": { - "description": "C++ SDK for the AWS verifiedpermissions service" - }, - "voice-id": { - "description": "C++ SDK for the AWS voice-id service" - }, - "vpc-lattice": { - "description": "C++ SDK for the AWS vpc-lattice service" - }, - "waf": { - "description": "C++ SDK for the AWS waf service" - }, - "waf-regional": { - "description": "C++ SDK for the AWS waf-regional service" - }, - "wafv2": { - "description": "C++ SDK for the AWS wafv2 service" - }, - "wellarchitected": { - "description": "C++ SDK for the AWS wellarchitected service" - }, - "wisdom": { - "description": "C++ SDK for the AWS wisdom service" - }, - "workdocs": { - "description": "C++ SDK for the AWS workdocs service" - }, - "worklink": { - "description": "C++ SDK for the AWS worklink service" - }, - "workmail": { - "description": "C++ SDK for the AWS workmail service" - }, - "workmailmessageflow": { - "description": "C++ SDK for the AWS workmailmessageflow service" - }, - "workspaces": { - "description": "C++ SDK for the AWS workspaces service" - }, - "workspaces-web": { - "description": "C++ SDK for the AWS workspaces-web service" - }, - "xray": { - "description": "C++ SDK for the AWS xray service" - } - } -} diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake new file mode 100644 index 00000000000..482ed9687f1 --- /dev/null +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -0,0 +1,32 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-common_12.5.0 + SHA512 46c9cc4ebec54f289ba7270356da4e89e5f8e890004c7a232200b87ca33357064c2f46670a1090fe41ca6962cdbc76d2e3520bb600438cbc0f21f15cf7816f04 +) + +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-common" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/_/_/_" + OPTIONS + -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json new file mode 100644 index 00000000000..8dd26d90820 --- /dev/null +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -0,0 +1,36 @@ +{ + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "name": "azure-storage-common-cpp", + "version-semver": "12.5.0", + "port-version": 1, + "description": [ + "Microsoft Azure Common Storage SDK for C++", + "This library provides common Azure Storage-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.10.3" + }, + { + "name": "libxml2", + "default-features": false, + "platform": "!windows" + }, + { + "name": "openssl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt deleted file mode 100644 index e2da221d7de..00000000000 --- a/ports/bzip2/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(bzip2 C) - -if(CMAKE_BUILD_TYPE STREQUAL Debug) - add_definitions(-DBZ_DEBUG) # enable extra assertions -endif() - -set(BZ2_SOURCES - blocksort.c - huffman.c - crctable.c - randtable.c - compress.c - decompress.c - bzlib.c) - -add_library(bz2 ${BZ2_SOURCES}) -set_target_properties(bz2 PROPERTIES - DEBUG_POSTFIX d - VERSION 1.0.6 - SOVERSION 1.0) -if(BUILD_SHARED_LIBS) - target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL) -endif() - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -endif() - -install(TARGETS bz2 - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -if(NOT BZIP2_SKIP_TOOLS) - add_executable(bzip2 bzip2.c ${BZ2_SOURCES}) - add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES}) - install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2) -endif() - -if(NOT BZIP2_SKIP_HEADERS) - install(FILES bzlib.h DESTINATION include) -endif() diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in deleted file mode 100644 index 91153c13b53..00000000000 --- a/ports/bzip2/bzip2.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@BZIP2_PREFIX@ -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: bzip2 -Description: bzip2 -Version: 1.0.6 -Requires: -Libs: -L${libdir} -l@bzname@ -Cflags: -I${includedir} \ No newline at end of file diff --git a/ports/bzip2/fix-import-export-macros.patch b/ports/bzip2/fix-import-export-macros.patch deleted file mode 100644 index fc67887da4e..00000000000 --- a/ports/bzip2/fix-import-export-macros.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/bzlib.h b/bzlib.h -index 8277123..84fbd0a 100644 ---- a/bzlib.h -+++ b/bzlib.h -@@ -65,29 +65,23 @@ typedef - } - bz_stream; - -- --#ifndef BZ_IMPORT --#define BZ_EXPORT --#endif -- - #ifndef BZ_NO_STDIO - /* Need a definitition for FILE */ - #include - #endif - - #ifdef _WIN32 --# include - # ifdef small - /* windows.h define small to char */ - # undef small - # endif --# ifdef BZ_EXPORT --# define BZ_API(func) WINAPI func --# define BZ_EXTERN extern -+# define BZ_API(func) func -+# if defined(BZ_BUILD_DLL) -+# define BZ_EXTERN __declspec(dllexport) -+# elif defined(BZ_IMPORT) -+# define BZ_EXTERN __declspec(dllimport) - # else -- /* import windows dll dynamically */ --# define BZ_API(func) (WINAPI * func) --# define BZ_EXTERN -+# define BZ_EXTERN - # endif - #else - # define BZ_API(func) func diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake deleted file mode 100644 index c03f48c48fb..00000000000 --- a/ports/bzip2/portfile.cmake +++ /dev/null @@ -1,56 +0,0 @@ -set(BZIP2_VERSION 1.0.8) -vcpkg_download_distfile(ARCHIVE - URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz" - FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" - SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES fix-import-export-macros.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - tool BZIP2_SKIP_TOOLS -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DBZIP2_SKIP_HEADERS=ON - -DBZIP2_SKIP_TOOLS=ON -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}") -else() - string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}") -endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}") - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}") - set(bzname bz2) - configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY) -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug") - set(bzname bz2d) - configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY) -endif() - -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/bzip2/usage b/ports/bzip2/usage deleted file mode 100644 index 084bf390ad5..00000000000 --- a/ports/bzip2/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package bzip2 is compatible with built-in CMake targets: - - find_package(BZip2 REQUIRED) - target_link_libraries(main PRIVATE BZip2::BZip2) diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json deleted file mode 100644 index b899ec15457..00000000000 --- a/ports/bzip2/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "bzip2", - "version-semver": "1.0.8", - "port-version": 0, - "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", - "homepage": "https://sourceware.org/bzip2/", - "documentation": "https://sourceware.org/bzip2/docs.html", - "license": "bzip2-1.0.6", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "tool": { - "description": "Builds bzip2 executable" - } - } -} diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch deleted file mode 100644 index c89dacdb585..00000000000 --- a/ports/catch2/fix-install-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -164,7 +164,7 @@ - - ## Provide some pkg-config integration - set(PKGCONFIG_INSTALL_DIR -- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig" -+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" - CACHE PATH "Path where catch2.pc is installed" - ) - configure_file( -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -401,16 +401,28 @@ - install( - TARGETS - Catch2 -- Catch2WithMain - EXPORT - Catch2Targets - LIBRARY DESTINATION - ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION - ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION - ${CMAKE_INSTALL_BINDIR} - ) -+ -+ install( -+ TARGETS -+ Catch2WithMain -+ EXPORT -+ Catch2Targets -+ LIBRARY DESTINATION -+ ${CMAKE_INSTALL_LIBDIR}/manual-link -+ ARCHIVE DESTINATION -+ ${CMAKE_INSTALL_LIBDIR}/manual-link -+ RUNTIME DESTINATION -+ ${CMAKE_INSTALL_BINDIR} -+ ) - - - install( diff --git a/ports/catch2/fix-uwp-build.patch b/ports/catch2/fix-uwp-build.patch deleted file mode 100644 index feee34cfbae..00000000000 --- a/ports/catch2/fix-uwp-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp -index 4465831d..7555a21f 100644 ---- a/src/catch2/catch_config.cpp -+++ b/src/catch2/catch_config.cpp -@@ -26,7 +26,12 @@ namespace { - # pragma warning( disable : 4996 ) - # endif - -+# if defined( WINAPI_FAMILY ) -+ // UWP doesn't support environment variables. -+ return false; -+# else - return std::getenv( "BAZEL_TEST" ) != nullptr; -+# endif - - # if defined( _MSC_VER ) - # pragma warning( pop ) -@@ -81,6 +86,8 @@ namespace Catch { - } ); - } - -+#if !defined( WINAPI_FAMILY ) -+ // UWP doesn't support environment variables. - if(provideBazelReporterOutput()){ - // Register a JUnit reporter for Bazel. Bazel sets an environment - // variable with the path to XML output. If this file is written to -@@ -102,6 +109,7 @@ namespace Catch { - { "junit", std::string( bazelOutputFilePtr ), {}, {} } ); - } - } -+#endif - - - // We now fixup the reporter specs to handle default output spec, diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake deleted file mode 100644 index 3c6090e5118..00000000000 --- a/ports/catch2/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO catchorg/Catch2 - REF v3.3.2 - SHA512 3d0c5666509a19be54ea0c48a3c8e1c4a951a2d991a7c9f7fe6d326661464538f1ab9dc573b1b2647f49fb6bef45bbd866142a4ce0fba38545ad182b8d55f61f - HEAD_REF devel - PATCHES - fix-install-path.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DCATCH_INSTALL_DOCS=OFF - -DCMAKE_CXX_STANDARD=17 -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -# We remove these folders because they are empty and cause warnings on the library installation -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/benchmark/internal") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/generators/internal") - -file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json deleted file mode 100644 index f3ab9ccca03..00000000000 --- a/ports/catch2/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "catch2", - "version-semver": "3.3.2", - "port-version": 1, - "description": "A modern, header-only test framework for unit testing.", - "homepage": "https://github.com/catchorg/Catch2", - "license": "BSL-1.0", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/crc32c/fix_clang-cl.patch b/ports/crc32c/fix_clang-cl.patch deleted file mode 100644 index d120243209c..00000000000 --- a/ports/crc32c/fix_clang-cl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84907285c..8c446b0c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT CMAKE_CXX_STANDARD) - endif(NOT CMAKE_CXX_STANDARD) - - # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake --if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -+if(MSVC) - # Use the highest warning level for Visual Studio. - set(CMAKE_CXX_WARNING_LEVEL 4) - if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake deleted file mode 100644 index 0280002fd2a..00000000000 --- a/ports/crc32c/portfile.cmake +++ /dev/null @@ -1,33 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/crc32c - REF 1.1.2 - SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 - HEAD_REF master - PATCHES - fix_clang-cl.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DCRC32C_BUILD_TESTS=OFF - -DCRC32C_BUILD_BENCHMARKS=OFF - -DCRC32C_USE_GLOG=OFF -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crc32c) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/crc32c/vcpkg.json b/ports/crc32c/vcpkg.json deleted file mode 100644 index 3acb74812e5..00000000000 --- a/ports/crc32c/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "crc32c", - "version": "1.1.2", - "port-version": 1, - "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", - "homepage": "https://github.com/google/crc32c", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch deleted file mode 100644 index 0a2ac6a57a2..00000000000 --- a/ports/fmt/fix-format-conflict.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h -index f44df01c..59cc4559 100644 ---- a/include/fmt/format-inl.h -+++ b/include/fmt/format-inl.h -@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, - error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); - auto it = buffer_appender(out); - if (message.size() <= inline_buffer_size - error_code_size) -- format_to(it, FMT_STRING("{}{}"), message, SEP); -- format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); -+ fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); -+ fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); - FMT_ASSERT(out.size() <= inline_buffer_size, ""); - } - diff --git a/ports/fmt/fix-write-batch.patch b/ports/fmt/fix-write-batch.patch deleted file mode 100644 index 7c17d603772..00000000000 --- a/ports/fmt/fix-write-batch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f21cf45..691a632 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,7 +157,7 @@ if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio") - join(netfxpath - "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\" - ".NETFramework\\v4.0") -- file(WRITE run-msbuild.bat " -+ file(WRITE ${CMAKE_BINARY_DIR}/run-msbuild.bat " - ${MSBUILD_SETUP} - ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*") - endif () diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake deleted file mode 100644 index f5f819a01a9..00000000000 --- a/ports/fmt/portfile.cmake +++ /dev/null @@ -1,66 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO fmtlib/fmt - REF 9.1.0 - SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be - HEAD_REF master - PATCHES - fix-write-batch.patch - fix-format-conflict.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DFMT_CMAKE_DIR=share/fmt - -DFMT_TEST=OFF - -DFMT_DOC=OFF -) - -vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll") - endif() - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll") - endif() - endif() - endif() - - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h - "defined(FMT_SHARED)" - "1" - ) -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_cmake_config_fixup() -vcpkg_fixup_pkgconfig() - -if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake - "lib/fmtd.dll" - "bin/fmtd.dll" - ) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake - "lib/fmt.dll" - "bin/fmt.dll" - ) - endif() -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -# Handle post-build CMake instructions -vcpkg_copy_pdbs() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/fmt/usage b/ports/fmt/usage deleted file mode 100644 index e5a9d704806..00000000000 --- a/ports/fmt/usage +++ /dev/null @@ -1,8 +0,0 @@ -The package fmt provides CMake targets: - - find_package(fmt CONFIG REQUIRED) - target_link_libraries(main PRIVATE fmt::fmt) - - # Or use the header-only version - find_package(fmt CONFIG REQUIRED) - target_link_libraries(main PRIVATE fmt::fmt-header-only) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json deleted file mode 100644 index a768a4e960d..00000000000 --- a/ports/fmt/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "fmt", - "version": "9.1.0", - "port-version": 1, - "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", - "homepage": "https://github.com/fmtlib/fmt", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake deleted file mode 100644 index 2cae4df0a1d..00000000000 --- a/ports/google-cloud-cpp/portfile.cmake +++ /dev/null @@ -1,85 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO googleapis/google-cloud-cpp - REF "v${VERSION}" - SHA512 225202a8e799f630f0b07c392bf305c28e21b99ef8dc5a670238a6d08e0e2816cd8ca1c43d7b252bcf5d289f875e64c16413085f63663265169807fd59977e43 - HEAD_REF main - PATCHES - support_absl_cxx17.patch -) - -if ("grpc-common" IN_LIST FEATURES) - vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") -endif () - -set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") -list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") -# This feature does not exist, but allows us to simplify the vcpkg.json -# file. -list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common") -list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "rest-common") -list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") -# google-cloud-cpp uses dialogflow_cx and dialogflow_es. Underscores -# are invalid in `vcpkg` features, we use dashes (`-`) as a separator -# for the `vcpkg` feature name, and convert it here to something that -# `google-cloud-cpp` would like. -if ("dialogflow-cx" IN_LIST FEATURES) - list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-cx") - list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_cx") -endif () -if ("dialogflow-es" IN_LIST FEATURES) - list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-es") - list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_es") -endif () - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" - -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF - -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF - -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF - -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF - -DBUILD_TESTING=OFF - # This is needed by the `experimental-storage-grpc` feature until vcpkg - # gets Protobuf >= 4.23.0. It has no effect for other features, so - # it is simpler to just always turn it on. - -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -foreach(feature IN LISTS FEATURES) - set(config_path "lib/cmake/google_cloud_cpp_${feature}") - # Most features get their own package in `google-cloud-cpp`. - # The exceptions are captured by this `if()` command, basically - # things like `core` and `experimental-storage-grpc` are skipped. - if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") - continue() - endif() - vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}" - CONFIG_PATH "${config_path}" - DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() -# These packages are automatically installed depending on what features are -# enabled. -foreach(suffix common googleapis grpc_utils rest_internal opentelemetry dialogflow_cx dialogflow_es) - set(config_path "lib/cmake/google_cloud_cpp_${suffix}") - if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") - continue() - endif() - vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}" - CONFIG_PATH "${config_path}" - DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch deleted file mode 100644 index 582b88a52d4..00000000000 --- a/ports/google-cloud-cpp/support_absl_cxx17.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fb0564..b4a251b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,14 @@ if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "") - set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}") - endif () - -+find_package(absl CONFIG REQUIRED) -+ -+# Use CMAKE_CXX_STANDARD=17 if ABSL_USE_CXX17 is set -+if (ABSL_USE_CXX17) -+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") -+ set(CMAKE_CXX_STANDARD 17) -+endif () -+ - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3) - message( diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json deleted file mode 100644 index 09da2aa504a..00000000000 --- a/ports/google-cloud-cpp/vcpkg.json +++ /dev/null @@ -1,1447 +0,0 @@ -{ - "name": "google-cloud-cpp", - "version": "2.15.1", - "description": "C++ Client Libraries for Google Cloud Platform APIs.", - "homepage": "https://github.com/googleapis/google-cloud-cpp", - "license": "Apache-2.0", - "supports": "!uwp", - "dependencies": [ - "abseil", - "openssl", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "bigquery", - "bigtable", - "iam", - "pubsub", - "spanner", - "storage" - ], - "features": { - "accessapproval": { - "description": "Access Approval API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "accesscontextmanager": { - "description": "Access Context Manager API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "advisorynotifications": { - "description": "Advisory Notifications API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "alloydb": { - "description": "Alloy DB API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "apigateway": { - "description": "API Gateway API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "apigeeconnect": { - "description": "Apigee Connect API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "apikeys": { - "description": "API Keys API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "appengine": { - "description": "App Engine Admin API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "artifactregistry": { - "description": "Artifact Registry API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "asset": { - "description": "Cloud Asset API C++ Client Library", - "supports": "!windows", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "accesscontextmanager", - "grpc-common", - "osconfig" - ] - } - ] - }, - "assuredworkloads": { - "description": "Assured Workloads API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "automl": { - "description": "Cloud AutoML API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "baremetalsolution": { - "description": "Bare Metal Solution API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "batch": { - "description": "Batch API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "beyondcorp": { - "description": "BeyondCorp API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "bigquery": { - "description": "The Google Cloud BigQuery C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "bigtable": { - "description": "The Google Cloud Bigtable C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "billing": { - "description": "Cloud Billing Budget API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "binaryauthorization": { - "description": "Binary Authorization API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grafeas", - "grpc-common" - ] - } - ] - }, - "certificatemanager": { - "description": "Certificate Manager API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "channel": { - "description": "Cloud Channel API C++ Client Library", - "supports": "!windows", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "cloudbuild": { - "description": "Cloud Build API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "commerce": { - "description": "Cloud Commerce C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "composer": { - "description": "Cloud Composer C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "confidentialcomputing": { - "description": "Confidential Computing API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "connectors": { - "description": "Connectors API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "contactcenterinsights": { - "description": "Contact Center AI Insights API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "container": { - "description": "Kubernetes Engine API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "containeranalysis": { - "description": "Container Analysis API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grafeas", - "grpc-common" - ] - } - ] - }, - "datacatalog": { - "description": "Google Cloud Data Catalog API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "datafusion": { - "description": "Cloud Data Fusion API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "datamigration": { - "description": "Database Migration API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "dataplex": { - "description": "Cloud Dataplex API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "dataproc": { - "description": "Cloud Dataproc API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "datastore": { - "description": "Cloud Datastore API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "datastream": { - "description": "Datastream API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "debugger": { - "description": "Stackdriver Debugger API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "deploy": { - "description": "Google Cloud Deploy API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "dialogflow-cx": { - "description": "Cloud Dialogflow CX API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "dialogflow-es": { - "description": "Cloud Dialogflow ES API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "discoveryengine": { - "description": "Discovery Engine API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "dlp": { - "description": "Cloud Data Loss Prevention (DLP) API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "documentai": { - "description": "Cloud Document AI API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "edgecontainer": { - "description": "Distributed Cloud Edge Container API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "eventarc": { - "description": "Eventarc API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "experimental-opentelemetry": { - "description": "OpenTelemetry C++ GCP Exporter Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "rest-common", - "trace" - ] - }, - "opentelemetry-cpp" - ] - }, - "experimental-storage-grpc": { - "description": "The GCS+gRPC plugin", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common", - "storage" - ] - } - ] - }, - "filestore": { - "description": "Cloud Filestore API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "functions": { - "description": "Cloud Functions API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "gameservices": { - "description": "Game Services API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "gkehub": { - "description": "GKE Hub C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "gkemulticloud": { - "description": "Anthos Multi-Cloud C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "grafeas": { - "description": "Protocol buffers implementing the 'Grafeas API' (metadata about software artifacts)", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "grpc-common": { - "description": "Dependencies used by all gRPC-based libraries", - "dependencies": [ - "grpc", - { - "name": "grpc", - "host": true - }, - "protobuf", - { - "name": "protobuf", - "host": true - } - ] - }, - "iam": { - "description": "The Google Cloud IAM C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "iap": { - "description": "Cloud Identity-Aware Proxy API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "ids": { - "description": "Cloud IDS API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "iot": { - "description": "Cloud IoT API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "kms": { - "description": "Cloud Key Management Service (KMS) API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "language": { - "description": "Cloud Natural Language API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "logging": { - "description": "Google Cloud Logging C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "managedidentities": { - "description": "Managed Service for Microsoft Active Directory API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "memcache": { - "description": "Cloud Memorystore for Memcached API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "metastore": { - "description": "Dataproc Metastore API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "migrationcenter": { - "description": "Migration Center API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "monitoring": { - "description": "Cloud Monitoring API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "networkconnectivity": { - "description": "Network Connectivity API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "networkmanagement": { - "description": "Network Management API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "networksecurity": { - "description": "Secure Web Proxy API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "notebooks": { - "description": "Notebooks API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "optimization": { - "description": "Cloud Optimization API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "orgpolicy": { - "description": "Organization Policy API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "osconfig": { - "description": "Cloud OS Config API C++ Client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "oslogin": { - "description": "Cloud OS Login API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "policysimulator": { - "description": "Policy Simulator API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "policytroubleshooter": { - "description": "Policy Troubleshooter API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "privateca": { - "description": "Certificate Authority API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "profiler": { - "description": "Cloud Profiler API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "pubsub": { - "description": "The Google Cloud Bigtable C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "rapidmigrationassessment": { - "description": "Rapid Migration Assessment C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "recommender": { - "description": "Recommender C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "redis": { - "description": "Google Cloud Memorystore for Redis API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "resourcemanager": { - "description": "Cloud Resource Manager API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "resourcesettings": { - "description": "Resource Settings API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "rest-common": { - "description": "Dependencies used by all REST-based libraries", - "dependencies": [ - { - "name": "curl", - "features": [ - "ssl" - ] - }, - "nlohmann-json" - ] - }, - "retail": { - "description": "Retail API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "run": { - "description": "Cloud Run Admin API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "scheduler": { - "description": "Cloud Scheduler API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "secretmanager": { - "description": "The Google Cloud Secret Manager C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "securitycenter": { - "description": "Security Command Center API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "servicecontrol": { - "description": "Service Control API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "servicedirectory": { - "description": "Service Directory API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "servicemanagement": { - "description": "Service Management API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "serviceusage": { - "description": "Service Usage API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "shell": { - "description": "Cloud Shell API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "spanner": { - "description": "The Google Cloud Spanner C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "speech": { - "description": "The Google Cloud Speech-to-Text C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "storage": { - "description": "The Google Cloud Storage C++ client library", - "dependencies": [ - "crc32c", - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "rest-common" - ] - } - ] - }, - "storageinsights": { - "description": "Storage Insights API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "storagetransfer": { - "description": "Storage Transfer API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "support": { - "description": "Cloud Support API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "talent": { - "description": "Cloud Talent Solution API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "tasks": { - "description": "The Google Cloud Tasks C++ client library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "texttospeech": { - "description": "Cloud Text-to-Speech API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "tpu": { - "description": "Cloud TPU API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "trace": { - "description": "Stackdriver Trace API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "translate": { - "description": "Cloud Translation API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "video": { - "description": "Video Services C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "videointelligence": { - "description": "Cloud Video Intelligence API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "vision": { - "description": "Cloud Vision API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "vmmigration": { - "description": "VM Migration API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "vmwareengine": { - "description": "VMware Engine API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "vpcaccess": { - "description": "Serverless VPC Access API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "webrisk": { - "description": "Web Risk API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "websecurityscanner": { - "description": "Web Security Scanner API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "workflows": { - "description": "Workflow Executions API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, - "workstations": { - "description": "Workstations API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - } - } -} diff --git a/ports/liblzma/add_support_ios.patch b/ports/liblzma/add_support_ios.patch deleted file mode 100644 index 79741639b60..00000000000 --- a/ports/liblzma/add_support_ios.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52439b3..0b5e371 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -574,6 +574,7 @@ if(HAVE_GETOPT_LONG) - - install(TARGETS xzdec - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT xzdec) - - if(UNIX) -@@ -701,6 +702,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) - - install(TARGETS xz - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT xz) - - if(UNIX) diff --git a/ports/liblzma/build-tools.patch b/ports/liblzma/build-tools.patch deleted file mode 100644 index 759345ef23a..00000000000 --- a/ports/liblzma/build-tools.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03b8301..820d08e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -584,6 +584,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake" - COMPONENT liblzma_Development) - - -+if(BUILD_TOOLS) - ############################################################################# - # getopt_long - ############################################################################# -@@ -793,6 +794,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) - endforeach() - endif() - endif() -+endif() - - - ############################################################################# diff --git a/ports/liblzma/fix_config_include.patch b/ports/liblzma/fix_config_include.patch deleted file mode 100644 index 91dc4c13ba5..00000000000 --- a/ports/liblzma/fix_config_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 34c6aca00..7b3708ab2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -413,6 +413,7 @@ if(WIN32) - if(BUILD_SHARED_LIBS) - # Add the Windows resource file for liblzma.dll. - target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) -+ target_include_directories(liblzma PRIVATE windows/vs2019) - - set_target_properties(liblzma PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake deleted file mode 100644 index 8631df28b0f..00000000000 --- a/ports/liblzma/portfile.cmake +++ /dev/null @@ -1,84 +0,0 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO lzmautils - FILENAME "xz-${VERSION}.tar.xz" - SHA512 f890ee5207799fbc7bb9ae031f444d39d82275b0e1b8cc7f01fdb9270050e38849bd1269db2a2f12fe87b5e23e03f9e809a5c3456d066c0a56e6f98d728553ea - PATCHES - fix_config_include.patch - win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. - add_support_ios.patch # add install bundle info for support ios - build-tools.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools BUILD_TOOLS -) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - set(WASM_OPTIONS -DCMAKE_C_BYTE_ORDER=LITTLE_ENDIAN -DCMAKE_CXX_BYTE_ORDER=LITTLE_ENDIAN) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - ${WASM_OPTIONS} - -DBUILD_TESTING=OFF - -DCREATE_XZ_SYMLINKS=OFF - -DCREATE_LZMA_SYMLINKS=OFF - MAYBE_UNUSED_VARIABLES - CREATE_XZ_SYMLINKS - CREATE_LZMA_SYMLINKS -) -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(includedir "\${prefix}/include") -set(PACKAGE_URL https://tukaani.org/xz/) -set(PACKAGE_VERSION 5.2.5) -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(PTHREAD_CFLAGS -pthread) -endif() -set(prefix "${CURRENT_INSTALLED_DIR}") -configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) -if (NOT VCPKG_BUILD_TYPE) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) -endif() -vcpkg_fixup_pkgconfig() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1") -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0") -endif() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share/man" -) - -set(TOOLS xz xzdec) -foreach(_tool IN LISTS TOOLS) - if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - list(REMOVE_ITEM TOOLS ${_tool}) - endif() -endforeach() -if(TOOLS) - vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/liblzma/usage b/ports/liblzma/usage deleted file mode 100644 index b1461c93fc0..00000000000 --- a/ports/liblzma/usage +++ /dev/null @@ -1,9 +0,0 @@ -liblzma is compatible with built-in CMake targets: - - find_package(LibLZMA REQUIRED) - target_link_libraries(main PRIVATE LibLZMA::LibLZMA) - -liblzma provides CMake targets: - - find_package(liblzma CONFIG REQUIRED) - target_link_libraries(main PRIVATE liblzma::liblzma) diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 826cdba0650..00000000000 --- a/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,64 +0,0 @@ -cmake_policy(PUSH) -cmake_policy(SET CMP0012 NEW) -cmake_policy(SET CMP0057 NEW) -set(z_vcpkg_liblzma_fixup_needed 0) -if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA) - get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) - get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY) - find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH) - # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it - find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH) - find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH) - unset(z_vcpkg_liblzma_prefix) - if(CMAKE_VERSION VERSION_LESS 3.16) - # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. - set(z_vcpkg_liblzma_fixup_needed 1) - set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}" CACHE INTERNAL "") - elseif(NOT TARGET LibLZMA::LibLZMA) - set(z_vcpkg_liblzma_fixup_needed 1) - endif() - # Known values, and required. Skip expensive tests. - set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "") - set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "") - set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "") -endif() - -_find_package(${ARGS}) - -if(z_vcpkg_liblzma_fixup_needed) - include(SelectLibraryConfigurations) - select_library_configurations(LIBLZMA) - if(NOT TARGET LibLZMA::LibLZMA) - # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14 - add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED) - if(DEFINED LIBLZMA_INCLUDE_DIRS) - set_target_properties(LibLZMA::LibLZMA PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}") - endif() - set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(LibLZMA::LibLZMA PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" - IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}") - if(EXISTS "${LIBLZMA_LIBRARY}") - set_target_properties(LibLZMA::LibLZMA PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${LIBLZMA_LIBRARY}") - endif() - endif() - if(LIBLZMA_LIBRARY_DEBUG) - # Backfill debug variant to versions of cmake before 3.16 - set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}") - endif() -endif() -if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads) - list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - if(TARGET LibLZMA::LibLZMA) - set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) - endif() -endif() -unset(z_vcpkg_liblzma_fixup_needed) -cmake_policy(POP) diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json deleted file mode 100644 index d0ac62bed49..00000000000 --- a/ports/liblzma/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "liblzma", - "version-semver": "5.4.1", - "port-version": 1, - "description": "Compression library with an API similar to that of zlib.", - "homepage": "https://tukaani.org/xz/", - "license": null, - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "tools": { - "description": "Build tools", - "supports": "!windows, mingw" - } - } -} diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch deleted file mode 100644 index 7011475de58..00000000000 --- a/ports/liblzma/win_output_name.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e80b524..cddbccb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -462,8 +462,11 @@ set_target_properties(liblzma PROPERTIES - - # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. - # Avoid the name lzma.dll because it would conflict with LZMA SDK. -- PREFIX "" -+ OUTPUT_NAME lzma - ) -+if(WIN32 AND NOT MINGW) -+ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) -+endif() - - # Create liblzma-config-version.cmake. We use this spelling instead of - # liblzmaConfig.cmake to make find_package work in case insensitive manner diff --git a/ports/libxml2/disable-docs.patch b/ports/libxml2/disable-docs.patch deleted file mode 100644 index 848961429d6..00000000000 --- a/ports/libxml2/disable-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f922d5ab..70466bc7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -599,15 +599,5 @@ if(LIBXML2_WITH_PYTHON) - endif() - --install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation -- PATTERN "Makefile.*" EXCLUDE -- PATTERN "*.1" EXCLUDE -- PATTERN "*.py" EXCLUDE -- PATTERN "*.res" EXCLUDE -- PATTERN "*.xml" EXCLUDE -- PATTERN "*.xsl" EXCLUDE) - - configure_package_config_file( - libxml2-config.cmake.cmake.in libxml2-config.cmake diff --git a/ports/libxml2/fix_cmakelist.patch b/ports/libxml2/fix_cmakelist.patch deleted file mode 100644 index f8c60d0f156..00000000000 --- a/ports/libxml2/fix_cmakelist.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f922d5ab..685964b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -420,15 +420,15 @@ endif() - if(LIBXML2_WITH_ICU) - target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) - if(WIN32) -- set(ICU_LIBS "-licudt -licuin -licuuc") -+ set(ICU_LIBS "icu-i18n") - else() -- set(ICU_LIBS "-licudata -licui18n -licuuc") -+ set(ICU_LIBS "icu-i18n") - endif() - endif() - - if(LIBXML2_WITH_LZMA) - target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) -- set(LZMA_LIBS "-llzma") -+ set(LZMA_LIBS "liblzma") - endif() - - if(LIBXML2_WITH_THREADS) -@@ -438,7 +438,7 @@ endif() - - if(LIBXML2_WITH_ZLIB) - target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) -- set(Z_LIBS "-lz") -+ set(Z_LIBS "zlib") - endif() - - set_target_properties( -@@ -490,23 +490,9 @@ set_target_properties( - SOVERSION ${LIBXML_MAJOR_VERSION} - ) - -+set(XML_LIB_NAME xml2) - if(MSVC) -- if(BUILD_SHARED_LIBS) -- set_target_properties( -- LibXml2 -- PROPERTIES -- DEBUG_POSTFIX d -- ) -- else() -- set_target_properties( -- LibXml2 -- PROPERTIES -- DEBUG_POSTFIX sd -- MINSIZEREL_POSTFIX s -- RELEASE_POSTFIX s -- RELWITHDEBINFO_POSTFIX s -- ) -- endif() -+ set(XML_LIB_NAME libxml2) - endif() - - install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) -@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN - - configure_package_config_file( - libxml2-config.cmake.cmake.in libxml2-config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - ) - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - COMPONENT development - ) - - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake - VERSION ${PROJECT_VERSION} -- COMPATIBILITY ExactVersion -+ COMPATIBILITY SameMinorVersion - ) - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - COMPONENT development - ) - - install( - EXPORT LibXml2 -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - NAMESPACE LibXml2:: - FILE libxml2-export.cmake - COMPONENT development -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 2653a7c5..2eb2f362 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -8,6 +8,7 @@ Name: libXML - Version: @VERSION@ - Description: libXML library version2. - Requires: --Libs: -L${libdir} @XML_LIBS@ --Libs.private: @XML_PRIVATE_LIBS@ @LIBS@ -+Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ -+Libs: -L${libdir} -l@XML_LIB_NAME@ -+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake deleted file mode 100644 index d2c9619a2cd..00000000000 --- a/ports/libxml2/portfile.cmake +++ /dev/null @@ -1,89 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/libxml2 - REF f507d167f1755b7eaea09fb1a44d29aab828b6d1 - SHA512 2ac3dcab31111f608a3fe33dde492c9653ad2bd49a792373acdd03d2787e1a4ef70eeb7a3d47cf67eefd43aee2ab75ec50b36cdcd124445ca206de924abb6021 - HEAD_REF master - PATCHES - disable-docs.patch - fix_cmakelist.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "ftp" LIBXML2_WITH_FTP - "http" LIBXML2_WITH_HTTP - "legacy" LIBXML2_WITH_LEGACY - "lzma" LIBXML2_WITH_LZMA - "zlib" LIBXML2_WITH_ZLIB - "tools" LIBXML2_WITH_PROGRAMS -) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DLIBXML2_WITH_TESTS=OFF - -DLIBXML2_WITH_HTML=ON - -DLIBXML2_WITH_C14N=ON - -DLIBXML2_WITH_CATALOG=ON - -DLIBXML2_WITH_DEBUG=ON - -DLIBXML2_WITH_ISO8859X=ON - -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR - -DLIBXML2_WITH_MEM_DEBUG=OFF - -DLIBXML2_WITH_MODULES=ON - -DLIBXML2_WITH_OUTPUT=ON - -DLIBXML2_WITH_PATTERN=ON - -DLIBXML2_WITH_PUSH=ON - -DLIBXML2_WITH_PYTHON=OFF - -DLIBXML2_WITH_READER=ON - -DLIBXML2_WITH_REGEXPS=ON - -DLIBXML2_WITH_RUN_DEBUG=OFF - -DLIBXML2_WITH_SAX1=ON - -DLIBXML2_WITH_SCHEMAS=ON - -DLIBXML2_WITH_SCHEMATRON=ON - -DLIBXML2_WITH_THREADS=ON - -DLIBXML2_WITH_THREAD_ALLOC=OFF - -DLIBXML2_WITH_TREE=ON - -DLIBXML2_WITH_VALID=ON - -DLIBXML2_WITH_WRITER=ON - -DLIBXML2_WITH_XINCLUDE=ON - -DLIBXML2_WITH_XPATH=ON - -DLIBXML2_WITH_XPTR=ON - -DLIBXML2_WITH_ICONV=OFF # [TileDB]: Can't negate in manifest, clobber here -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libxml2") -vcpkg_fixup_pkgconfig() - -vcpkg_copy_pdbs() - -if("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h") - file(READ "${_file}" _contents) - string(REPLACE "#ifdef LIBXML_STATIC" "#undef LIBXML_STATIC\n#define LIBXML_STATIC\n#ifdef LIBXML_STATIC" _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") -endif() - -file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. - -# Cleanup -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxml2/usage b/ports/libxml2/usage deleted file mode 100644 index c7a4878e9b9..00000000000 --- a/ports/libxml2/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package libxml2 is compatible with built-in CMake targets: - - find_package(LibXml2 REQUIRED) - target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 705f22c6a35..00000000000 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,3 +0,0 @@ -list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") -_find_package(${ARGS} CONFIG) -set(LIBXML2_FOUND "${LibXml2_FOUND}") # fphsa compatibility diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json deleted file mode 100644 index 47f4866b135..00000000000 --- a/ports/libxml2/vcpkg.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "libxml2", - "version": "2.10.3", - "port-version": 1, - "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", - "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "iconv", - "lzma", - "zlib" - ], - "features": { - "ftp": { - "description": "Add the FTP support", - "supports": "!uwp" - }, - "http": { - "description": "Add the HTTP support", - "supports": "!uwp" - }, - "iconv": { - "description": "Add ICONV support", - "dependencies": [ - "libiconv" - ] - }, - "legacy": { - "description": "Add deprecated APIs for compatibility" - }, - "lzma": { - "description": "Use LZMA", - "dependencies": [ - "liblzma" - ] - }, - "tools": { - "description": "Build tools" - }, - "zlib": { - "description": "Use ZLib", - "dependencies": [ - "zlib" - ] - } - } -} diff --git a/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch b/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch deleted file mode 100755 index d6f444810c0..00000000000 --- a/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse -Date: Fri, 26 Feb 2021 15:21:20 +0100 -Subject: [PATCH 001/120] Fix potential memory corruption with negative - memmove() size - ---- - lib/lz4.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/lz4.c b/lib/lz4.c -index 5f524d0..c2f504e 100644 ---- a/lib/lz4.c -+++ b/lib/lz4.c -@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( - const size_t dictSize /* note : = 0 if noDict */ - ) - { -- if (src == NULL) { return -1; } -+ if ((src == NULL) || (outputSize < 0)) { return -1; } - - { const BYTE* ip = (const BYTE*) src; - const BYTE* const iend = ip + srcSize; --- -2.36.1 - diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt deleted file mode 100644 index 142a229006f..00000000000 --- a/ports/lz4/CMakeLists.txt +++ /dev/null @@ -1,57 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(lz4 C) - -if(MSVC AND BUILD_SHARED_LIBS) - add_definitions(-DLZ4_DLL_EXPORT) -endif() -add_definitions(-DXXH_NAMESPACE=LZ4_) - -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix") -set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") -set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") -set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") -set(INSTALL_CMAKE_DIR "share/lz4" CACHE PATH "Path where cmake configs will be installed") - -file(GLOB LZ4_HEADERS lib/*.h) - -add_library(lz4 - ${LZ4_HEADERS} - lib/lz4.c - lib/lz4frame.c - lib/lz4hc.c - lib/xxhash.c -) - -target_include_directories(lz4 PUBLIC $ $) -set_target_properties(lz4 PROPERTIES PUBLIC_HEADER ${LZ4_HEADERS}) - -install(TARGETS lz4 - EXPORT lz4Config - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" - PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" - PRIVATE_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" - COMPONENT dev -) - -FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h") -list(REMOVE_ITEM lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/xxhash.h") -INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}") - -install(EXPORT lz4Config - FILE lz4-config.cmake - NAMESPACE lz4:: - DESTINATION "${INSTALL_CMAKE_DIR}" -) - -# Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry) -export(PACKAGE lz4) - -# Create pkgconfig module file -file(STRINGS "lib/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_(MAJOR|MINOR|RELEASE) ") -string(REGEX REPLACE "^.*MAJOR +([0-9]+).*MINOR +([0-9]+).*RELEASE +([0-9]+).*$" "\\1.\\2.\\3" VERSION "${LZ4_H}") -set(INCLUDEDIR [[${prefix}/include]]) -set(LIBDIR [[${prefix}/lib]]) -configure_file(lib/liblz4.pc.in lib/liblz4.pc) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/liblz4.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake deleted file mode 100644 index a2e3b74f911..00000000000 --- a/ports/lz4/portfile.cmake +++ /dev/null @@ -1,42 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO lz4/lz4 - REF v1.9.3 - SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c - HEAD_REF dev - PATCHES - 0001-Fix-potential-memory-corruption-with-negative-memmov.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(DLL_IMPORT "1 && defined(_MSC_VER)") -else() - set(DLL_IMPORT "0") -endif() -foreach(FILE lz4.h lz4frame.h) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${FILE}" - "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" - "${DLL_IMPORT}" - ) -endforeach() - -vcpkg_cmake_config_fixup() -vcpkg_fixup_pkgconfig() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblz4.pc" " -llz4" " -llz4d") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/lib/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lz4/vcpkg.json b/ports/lz4/vcpkg.json deleted file mode 100644 index 597e902dd15..00000000000 --- a/ports/lz4/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "lz4", - "version": "1.9.3", - "port-version": 4, - "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", - "homepage": "https://github.com/lz4/lz4", - "license": "BSD-2-Clause AND GPL-2.0-only", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake deleted file mode 100644 index 947cba35728..00000000000 --- a/ports/nlohmann-json/portfile.cmake +++ /dev/null @@ -1,48 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO nlohmann/json - REF v3.11.2 - SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 - HEAD_REF master -) - -if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) - set(nlohmann-json_IMPLICIT_CONVERSIONS ON) -endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "diagnostics" JSON_Diagnostics -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} - -DJSON_Install=ON - -DJSON_MultipleHeaders=ON - -DJSON_BuildTests=OFF - -DJSON_ImplicitConversions=${nlohmann-json_IMPLICIT_CONVERSIONS} -) -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "share/cmake/nlohmann_json") -vcpkg_fixup_pkgconfig() - -vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake" - "{_IMPORT_PREFIX}/nlohmann_json.natvis" - "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" -) -if(EXISTS "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis") - file(RENAME - "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis" - "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis" - ) -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# Handle usage -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nlohmann-json/usage b/ports/nlohmann-json/usage deleted file mode 100644 index 19c76d508d0..00000000000 --- a/ports/nlohmann-json/usage +++ /dev/null @@ -1,12 +0,0 @@ -The package nlohmann-json provides CMake targets: - - find_package(nlohmann_json CONFIG REQUIRED) - target_link_libraries(main PRIVATE nlohmann_json::nlohmann_json) - -The package nlohmann-json can be configured to not provide implicit conversions via a custom triplet file: - - set(nlohmann-json_IMPLICIT_CONVERSIONS OFF) - -For more information, see the docs here: - - https://json.nlohmann.me/api/macros/json_use_implicit_conversions/ diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json deleted file mode 100644 index cc65b9d204d..00000000000 --- a/ports/nlohmann-json/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "nlohmann-json", - "version-semver": "3.11.2", - "description": "JSON for Modern C++", - "homepage": "https://github.com/nlohmann/json", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "diagnostics": { - "description": "Build json_diagnostics" - } - } -} diff --git a/ports/s2n/fix-cmake-target-path.patch b/ports/s2n/fix-cmake-target-path.patch deleted file mode 100644 index 723b0b236fb..00000000000 --- a/ports/s2n/fix-cmake-target-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b) -+++ b/CMakeLists.txt (date 1675011451052) -@@ -670,7 +670,7 @@ - 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 ---- a/cmake/s2n-config.cmake (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b) -+++ b/cmake/s2n-config.cmake (date 1675011032538) -@@ -6,21 +6,6 @@ - endif() - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") --find_dependency(crypto) -- --# Allow static or shared lib to be used. --# If both are installed, choose based on BUILD_SHARED_LIBS. --if (BUILD_SHARED_LIBS) -- if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/shared") -- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) -- else() -- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) -- endif() --else() -- if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/static") -- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) -- else() -- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) -- endif() --endif() -+find_dependency(OpenSSL COMPONENTS Crypto) - -+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) -\ No newline at end of file \ No newline at end of file diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake deleted file mode 100644 index 0909ebee5bc..00000000000 --- a/ports/s2n/portfile.cmake +++ /dev/null @@ -1,46 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO aws/s2n-tls - REF "v${VERSION}" - SHA512 deead85f2ab22441e1110d442fc93273d96d8dd6a203940cca7ef166fc1c9e7ab75ffe2d550e013e1e1e3266b208904cff94cc2482d6fd00e0546293b0ba11d4 - PATCHES - fix-cmake-target-path.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tests BUILD_TESTING -) - -set(EXTRA_ARGS) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - set(EXTRA_ARGS "-DS2N_NO_PQ=TRUE") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${EXTRA_ARGS} - ${FEATURE_OPTIONS} - -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake) - -if(BUILD_TESTING) - message(STATUS "Testing") - vcpkg_cmake_build(TARGET test LOGFILE_BASE test) -endif() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/s2n" - "${CURRENT_PACKAGES_DIR}/share/s2n/modules" -) - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json deleted file mode 100644 index 76f883756f6..00000000000 --- a/ports/s2n/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "s2n", - "version": "1.3.56", - "description": "C99 implementation of the TLS/SSL protocols.", - "homepage": "https://github.com/aws/s2n-tls", - "license": "Apache-2.0", - "supports": "!uwp & !windows", - "dependencies": [ - "openssl", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "tests": { - "description": "Build and run the tests" - } - } -} diff --git a/ports/spdlog/fmt-header.patch b/ports/spdlog/fmt-header.patch deleted file mode 100644 index 670d5a2f03e..00000000000 --- a/ports/spdlog/fmt-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bench/bench.cpp b/bench/bench.cpp -index 8a46837a6..ae47f047c 100644 ---- a/bench/bench.cpp -+++ b/bench/bench.cpp -@@ -15,7 +15,7 @@ - #if defined(SPDLOG_USE_STD_FORMAT) - # include - #elif defined(SPDLOG_FMT_EXTERNAL) --# include -+# include - #else - # include "spdlog/fmt/bundled/format.h" - #endif diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake deleted file mode 100644 index 21a61d9b9ff..00000000000 --- a/ports/spdlog/portfile.cmake +++ /dev/null @@ -1,73 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO gabime/spdlog - REF v1.11.0 - SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 - HEAD_REF v1.x - PATCHES - fmt-header.patch # https://github.com/gabime/spdlog/pull/2545 -) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - benchmark SPDLOG_BUILD_BENCH - wchar SPDLOG_WCHAR_SUPPORT -) - -# SPDLOG_WCHAR_FILENAMES can only be configured in triplet file since it is an alternative (not additive) -if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) - set(SPDLOG_WCHAR_FILENAMES OFF) -endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - if("wchar" IN_LIST FEATURES) - message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") - elseif(SPDLOG_WCHAR_FILENAMES) - message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") - endif() -endif() - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DSPDLOG_FMT_EXTERNAL=ON - -DSPDLOG_INSTALL=ON - -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED} - -DSPDLOG_WCHAR_FILENAMES=${SPDLOG_WCHAR_FILENAMES} - -DSPDLOG_BUILD_EXAMPLE=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog) -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled") - -# add support for integration other than cmake -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h - "// #define SPDLOG_FMT_EXTERNAL" - "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" -) -if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h - "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" - "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" - ) -endif() -if(SPDLOG_WCHAR_FILENAMES) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h - "// #define SPDLOG_WCHAR_FILENAMES" - "#ifndef SPDLOG_WCHAR_FILENAMES\n#define SPDLOG_WCHAR_FILENAMES\n#endif" - ) -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json deleted file mode 100644 index a88014f9ad0..00000000000 --- a/ports/spdlog/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "spdlog", - "version-semver": "1.11.0", - "description": "Very fast, header only, C++ logging library", - "homepage": "https://github.com/gabime/spdlog", - "license": "MIT", - "dependencies": [ - "fmt", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "benchmark": { - "description": "Use google benchmark", - "dependencies": [ - "benchmark" - ] - }, - "wchar": { - "description": "Build with wchar_t (Windows only)", - "supports": "windows" - } - } -} diff --git a/ports/vcpkg-cmake-config/copyright b/ports/vcpkg-cmake-config/copyright deleted file mode 100644 index 2e4eac8264f..00000000000 --- a/ports/vcpkg-cmake-config/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ports/vcpkg-cmake-config/portfile.cmake b/ports/vcpkg-cmake-config/portfile.cmake deleted file mode 100644 index fc3dbafd518..00000000000 --- a/ports/vcpkg-cmake-config/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) - # make FATAL_ERROR in CI when issue #16773 fixed - message(WARNING "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.") -endif() - -file(INSTALL - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_config_fixup.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/vcpkg-cmake-config/vcpkg-port-config.cmake b/ports/vcpkg-cmake-config/vcpkg-port-config.cmake deleted file mode 100644 index 980d411315c..00000000000 --- a/ports/vcpkg-cmake-config/vcpkg-port-config.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_config_fixup.cmake") diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json deleted file mode 100644 index db965341a7e..00000000000 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "vcpkg-cmake-config", - "version-date": "2022-02-06", - "port-version": 1, - "documentation": "https://vcpkg.io/en/docs/README.html", - "license": "MIT" -} diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake deleted file mode 100644 index 368e5809ac2..00000000000 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ /dev/null @@ -1,258 +0,0 @@ -include_guard(GLOBAL) - -function(vcpkg_cmake_config_fixup) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH;TOOLS_PATH" "") - - if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - if(NOT arg_PACKAGE_NAME) - set(arg_PACKAGE_NAME "${PORT}") - endif() - if(NOT arg_CONFIG_PATH) - set(arg_CONFIG_PATH "share/${arg_PACKAGE_NAME}") - endif() - if(NOT arg_TOOLS_PATH) - set(arg_TOOLS_PATH "tools/${PORT}") - endif() - set(target_path "share/${arg_PACKAGE_NAME}") - - string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - - set(debug_share "${CURRENT_PACKAGES_DIR}/debug/${target_path}") - set(release_share "${CURRENT_PACKAGES_DIR}/${target_path}") - - if(NOT arg_CONFIG_PATH STREQUAL "share/${arg_PACKAGE_NAME}") - if(arg_CONFIG_PATH STREQUAL "share") - set(arg_CONFIG_PATH z_vcpkg_share) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${arg_CONFIG_PATH}") - file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}") - endif() - - set(debug_config "${CURRENT_PACKAGES_DIR}/debug/${arg_CONFIG_PATH}") - set(release_config "${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(NOT EXISTS "${debug_config}") - message(FATAL_ERROR "'${debug_config}' does not exist.") - endif() - - # This roundabout handling enables CONFIG_PATH = share - file(MAKE_DIRECTORY "${debug_share}") - file(GLOB files "${debug_config}/*") - file(COPY ${files} DESTINATION "${debug_share}") - file(REMOVE_RECURSE "${debug_config}") - endif() - - file(GLOB files "${release_config}/*") - file(COPY ${files} DESTINATION "${release_share}") - file(REMOVE_RECURSE "${release_config}") - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - get_filename_component(debug_config_dir_name "${debug_config}" NAME) - string(TOLOWER "${debug_config_dir_name}" debug_config_dir_name) - if(debug_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(REMOVE_RECURSE "${debug_config}") - else() - get_filename_component(debug_config_parent_dir "${debug_config}" DIRECTORY) - get_filename_component(debug_config_dir_name "${debug_config_parent_dir}" NAME) - string(TOLOWER "${debug_config_dir_name}" debug_config_dir_name) - if(debug_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(REMOVE_RECURSE "${debug_config_parent_dir}") - endif() - endif() - endif() - - get_filename_component(release_config_dir_name "${release_config}" NAME) - string(TOLOWER "${release_config_dir_name}" release_config_dir_name) - if(release_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(REMOVE_RECURSE "${release_config}") - else() - get_filename_component(release_config_parent_dir "${release_config}" DIRECTORY) - get_filename_component(release_config_dir_name "${release_config_parent_dir}" NAME) - string(TOLOWER "${release_config_dir_name}" release_config_dir_name) - if(release_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(REMOVE_RECURSE "${release_config_parent_dir}") - endif() - endif() - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(NOT EXISTS "${debug_share}") - message(FATAL_ERROR "'${debug_share}' does not exist.") - endif() - endif() - - file(GLOB_RECURSE release_targets - "${release_share}/*-release.cmake" - ) - foreach(release_target IN LISTS release_targets) - file(READ "${release_target}" contents) - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") - file(WRITE "${release_target}" "${contents}") - endforeach() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB_RECURSE debug_targets - "${debug_share}/*-debug.cmake" - ) - foreach(debug_target IN LISTS debug_targets) - file(RELATIVE_PATH debug_target_rel "${debug_share}" "${debug_target}") - - file(READ "${debug_target}" contents) - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") - string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" contents "${contents}") - string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" contents "${contents}") - file(WRITE "${release_share}/${debug_target_rel}" "${contents}") - - file(REMOVE "${debug_target}") - endforeach() - endif() - - #Fix ${_IMPORT_PREFIX} and absolute paths in cmake generated targets and configs; - #Since those can be renamed we have to check in every *.cmake, but only once. - file(GLOB_RECURSE main_cmakes "${release_share}/*.cmake") - if(NOT DEFINED Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) - vcpkg_list(SET Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) - endif() - foreach(already_fixed_up IN LISTS Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) - vcpkg_list(REMOVE_ITEM main_cmakes "${already_fixed_up}") - endforeach() - vcpkg_list(APPEND Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP ${main_cmakes}) - set(Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP "${Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP}" CACHE INTERNAL "") - - foreach(main_cmake IN LISTS main_cmakes) - file(READ "${main_cmake}" contents) - # Note: I think the following comment is no longer true, since we now require the path to be `share/blah` - # however, I don't know it for sure. - # - nimazzuc - - #This correction is not correct for all cases. To make it correct for all cases it needs to consider - #original folder deepness to CURRENT_PACKAGES_DIR in comparison to the moved to folder deepness which - #is always at least (>=) 2, e.g. share/${PORT}. Currently the code assumes it is always 2 although - #this requirement is only true for the *Config.cmake. The targets are not required to be in the same - #folder as the *Config.cmake! - if(NOT arg_NO_PREFIX_CORRECTION) - string(REGEX REPLACE -[[get_filename_component\(_IMPORT_PREFIX "\${CMAKE_CURRENT_LIST_FILE}" PATH\)( -get_filename_component\(_IMPORT_PREFIX "\${_IMPORT_PREFIX}" PATH\))*]] -[[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] - contents "${contents}") # see #1044 for details why this replacement is necessary. See #4782 why it must be a regex. - string(REGEX REPLACE -[[get_filename_component\(PACKAGE_PREFIX_DIR "\${CMAKE_CURRENT_LIST_DIR}/\.\./(\.\./)*" ABSOLUTE\)]] -[[get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)]] - contents "${contents}") - string(REGEX REPLACE -[[get_filename_component\(PACKAGE_PREFIX_DIR "\${CMAKE_CURRENT_LIST_DIR}/\.\.((\\|/)\.\.)*" ABSOLUTE\)]] -[[get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)]] - contents "${contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 - endif() - - # Merge release and debug configurations of target property INTERFACE_LINK_LIBRARIES. - string(REPLACE "${release_share}/" "${debug_share}/" debug_cmake "${main_cmake}") - if(DEFINED VCPKG_BUILD_TYPE) - # Skip. Warning: A release-only port in a dual-config installation - # may pull release dependencies into the debug configuration. - elseif(NOT contents MATCHES "INTERFACE_LINK_LIBRARIES") - # Skip. No relevant properties. - elseif(NOT contents MATCHES "# Generated CMake target import file\\.") - # Skip. No safe assumptions about a matching debug import file. - elseif(NOT EXISTS "${debug_cmake}") - message(SEND_ERROR "Did not find a debug import file matching '${main_cmake}'") - else() - file(READ "${debug_cmake}" debug_contents) - while(contents MATCHES "set_target_properties\\(([^ \$]*) PROPERTIES[^)]*\\)") - set(matched_command "${CMAKE_MATCH_0}") - string(REPLACE "+" "\\+" target "${CMAKE_MATCH_1}") - if(NOT debug_contents MATCHES "set_target_properties\\(${target} PROPERTIES[^)]*\\)") - message(SEND_ERROR "Did not find a debug configuration for target '${target}'.") - endif() - set(debug_command "${CMAKE_MATCH_0}") - string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" release_line "${matched_command}") - set(release_libs "${CMAKE_MATCH_1}") - string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" debug_line "${debug_command}") - set(debug_libs "${CMAKE_MATCH_1}") - z_vcpkg_cmake_config_fixup_merge(merged_libs release_libs debug_libs) - string(REPLACE "${release_line}" " INTERFACE_LINK_LIBRARIES \"${merged_libs}\"" updated_command "${matched_command}") - string(REPLACE "set_target_properties" "set_target_properties::done" updated_command "${updated_command}") # Prevend 2nd match - string(REPLACE "${matched_command}" "${updated_command}" contents "${contents}") - endwhile() - string(REPLACE "set_target_properties::done" "set_target_properties" contents "${contents}") # Restore original command - endif() - - #Fix absolute paths to installed dir with ones relative to ${CMAKE_CURRENT_LIST_DIR} - #This happens if vcpkg built libraries are directly linked to a target instead of using - #an imported target. - string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") - file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir) - string(REPLACE "${cmake_current_packages_dir}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") - # If ${VCPKG_IMPORT_PREFIX} was actually used, inject a definition of it: - string(FIND "${contents}" [[${VCPKG_IMPORT_PREFIX}]] index) - if (NOT index STREQUAL "-1") - get_filename_component(main_cmake_dir "${main_cmake}" DIRECTORY) - # Calculate relative to be a sequence of "../" - file(RELATIVE_PATH relative "${main_cmake_dir}" "${cmake_current_packages_dir}") - string(PREPEND contents "get_filename_component(VCPKG_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}\/${relative}\" ABSOLUTE)\n") - endif() - - file(WRITE "${main_cmake}" "${contents}") - endforeach() - - file(GLOB_RECURSE unused_files - "${debug_share}/*[Tt]argets.cmake" - "${debug_share}/*[Cc]onfig.cmake" - "${debug_share}/*[Cc]onfigVersion.cmake" - "${debug_share}/*[Cc]onfig-version.cmake" - ) - foreach(unused_file IN LISTS unused_files) - file(REMOVE "${unused_file}") - endforeach() - - # Remove /debug// if it's empty. - file(GLOB_RECURSE remaining_files "${debug_share}/*") - if(remaining_files STREQUAL "") - file(REMOVE_RECURSE "${debug_share}") - endif() - - # Remove /debug/share/ if it's empty. - file(GLOB_RECURSE remaining_files "${CURRENT_PACKAGES_DIR}/debug/share/*") - if(remaining_files STREQUAL "") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - endif() -endfunction() - -# Merges link interface library lists for release and debug -# into a single expression which use generator expression as necessary. -function(z_vcpkg_cmake_config_fixup_merge out_var release_var debug_var) - set(release_libs "VCPKG;${${release_var}}") - string(REGEX REPLACE ";optimized;([^;]*)" ";\\1" release_libs "${release_libs}") - string(REGEX REPLACE ";debug;([^;]*)" ";" release_libs "${release_libs}") - list(REMOVE_AT release_libs 0) - list(FILTER release_libs EXCLUDE REGEX [[^\\[$]<\\[$]:]]) - list(TRANSFORM release_libs REPLACE [[^\\[$]<\\[$]>:(.*)>$]] "\\1") - - set(debug_libs "VCPKG;${${debug_var}}") - string(REGEX REPLACE ";optimized;([^;]*)" ";" debug_libs "${debug_libs}") - string(REGEX REPLACE ";debug;([^;]*)" ";\\1" debug_libs "${debug_libs}") - list(REMOVE_AT debug_libs 0) - list(FILTER debug_libs EXCLUDE REGEX [[^\\[$]<\\[$]>:]]) - list(TRANSFORM debug_libs REPLACE [[^\\[$]<\\[$]:(.*)>$]] "\\1") - - set(merged_libs "") - foreach(release_lib debug_lib IN ZIP_LISTS release_libs debug_libs) - if(release_lib STREQUAL debug_lib) - list(APPEND merged_libs "${release_lib}") - else() - if(release_lib) - list(APPEND merged_libs "\\\$<\\\$>:${release_lib}>") - endif() - if(debug_lib) - list(APPEND merged_libs "\\\$<\\\$:${debug_lib}>") - endif() - endif() - endforeach() - set("${out_var}" "${merged_libs}" PARENT_SCOPE) -endfunction() diff --git a/ports/vcpkg-cmake/portfile.cmake b/ports/vcpkg-cmake/portfile.cmake deleted file mode 100644 index 0b7dd502017..00000000000 --- a/ports/vcpkg-cmake/portfile.cmake +++ /dev/null @@ -1,14 +0,0 @@ -if(VCPKG_CROSSCOMPILING) - # make FATAL_ERROR in CI when issue #16773 fixed - message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") -endif() - -file(INSTALL - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/ports/vcpkg-cmake/vcpkg-port-config.cmake b/ports/vcpkg-cmake/vcpkg-port-config.cmake deleted file mode 100644 index f2a973d4ebc..00000000000 --- a/ports/vcpkg-cmake/vcpkg-port-config.cmake +++ /dev/null @@ -1,3 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json deleted file mode 100644 index 94363823474..00000000000 --- a/ports/vcpkg-cmake/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-cmake", - "version-date": "2022-10-30", - "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", - "license": "MIT" -} diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake deleted file mode 100644 index 47933b3fe9f..00000000000 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ /dev/null @@ -1,91 +0,0 @@ -include_guard(GLOBAL) - -function(vcpkg_cmake_build) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "TARGET;LOGFILE_BASE" "") - - if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_cmake_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - if(NOT DEFINED arg_LOGFILE_BASE) - set(arg_LOGFILE_BASE "build") - endif() - vcpkg_list(SET build_param) - vcpkg_list(SET parallel_param) - vcpkg_list(SET no_parallel_param) - - if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") - vcpkg_list(SET build_param "-v") # verbose output - vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_param "-j1") - elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") - vcpkg_list(SET build_param - "/p:VCPkgLocalAppDataDisabled=true" - "/p:UseIntelMKL=No" - ) - vcpkg_list(SET parallel_param "/m") - elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") - # No options are currently added for nmake builds - elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - vcpkg_list(SET build_param "VERBOSE=1") - vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_param "") - elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - vcpkg_list(SET parallel_param -jobs "${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_param -jobs 1) - else() - message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") - endif() - - vcpkg_list(SET target_param) - if(arg_TARGET) - vcpkg_list(SET target_param "--target" "${arg_TARGET}") - endif() - - foreach(build_type IN ITEMS debug release) - if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") - if("${build_type}" STREQUAL "debug") - set(short_build_type "dbg") - set(config "Debug") - else() - set(short_build_type "rel") - set(config "Release") - endif() - - message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") - - if(arg_ADD_BIN_TO_PATH) - vcpkg_backup_env_variables(VARS PATH) - if("${build_type}" STREQUAL "debug") - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") - else() - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") - endif() - endif() - - if(arg_DISABLE_PARALLEL) - vcpkg_execute_build_process( - COMMAND - "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} - -- ${build_param} ${no_parallel_param} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" - ) - else() - vcpkg_execute_build_process( - COMMAND - "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} - -- ${build_param} ${parallel_param} - NO_PARALLEL_COMMAND - "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} - -- ${build_param} ${no_parallel_param} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" - ) - endif() - - if(arg_ADD_BIN_TO_PATH) - vcpkg_restore_env_variables(VARS PATH) - endif() - endif() - endforeach() -endfunction() diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake deleted file mode 100644 index 832bbf70079..00000000000 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ /dev/null @@ -1,320 +0,0 @@ -include_guard(GLOBAL) - -macro(z_vcpkg_cmake_configure_both_set_or_unset var1 var2) - if(DEFINED ${var1} AND NOT DEFINED ${var2}) - message(FATAL_ERROR "If ${var1} is set, then ${var2} must be set.") - elseif(NOT DEFINED ${var1} AND DEFINED ${var2}) - message(FATAL_ERROR "If ${var2} is set, then ${var1} must be set.") - endif() -endmacro() - -function(vcpkg_cmake_configure) - cmake_parse_arguments(PARSE_ARGV 0 "arg" - "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG;Z_CMAKE_GET_VARS_USAGE" - "SOURCE_PATH;GENERATOR;LOGFILE_BASE" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" - ) - - if(NOT arg_Z_CMAKE_GET_VARS_USAGE AND DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) - message(WARNING "${CMAKE_CURRENT_FUNCTION} already called; this function should only be called once.") - endif() - if(arg_PREFER_NINJA) - message(WARNING "PREFER_NINJA has been deprecated in ${CMAKE_CURRENT_FUNCTION}. Please remove it from the portfile!") - endif() - - if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - - if(NOT DEFINED arg_SOURCE_PATH) - message(FATAL_ERROR "SOURCE_PATH must be set") - endif() - if(NOT DEFINED arg_LOGFILE_BASE) - set(arg_LOGFILE_BASE "config-${TARGET_TRIPLET}") - endif() - - set(manually_specified_variables "") - - if(arg_Z_CMAKE_GET_VARS_USAGE) - set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") - else() - set(configuring_message "Configuring ${TARGET_TRIPLET}") - - foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) - if("${option}" MATCHES "^-D([^:=]*)[:=]") - vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") - endif() - endforeach() - vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) - foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) - vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") - endforeach() - debug_message("manually specified variables: ${manually_specified_variables}") - endif() - - if(CMAKE_HOST_WIN32) - if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(host_architecture "$ENV{PROCESSOR_ARCHITEW6432}") - else() - set(host_architecture "$ENV{PROCESSOR_ARCHITECTURE}") - endif() - endif() - - set(ninja_host ON) # Ninja availability - if(host_architecture STREQUAL "x86" OR DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) - # Prebuilt ninja binaries are only provided for x64 hosts - find_program(NINJA NAMES ninja ninja-build) - if(NOT NINJA) - set(ninja_host OFF) - set(arg_DISABLE_PARALLEL_CONFIGURE ON) - set(arg_WINDOWS_USE_MSBUILD ON) - endif() - endif() - - set(generator "") - set(architecture_options "") - if(arg_WINDOWS_USE_MSBUILD AND VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) - vcpkg_list(APPEND architecture_options "-A${arch}") - if(DEFINED VCPKG_PLATFORM_TOOLSET) - vcpkg_list(APPEND arg_OPTIONS "-T${VCPKG_PLATFORM_TOOLSET}") - endif() - if(NOT generator) - message(FATAL_ERROR "Unable to determine appropriate Visual Studio generator for triplet ${TARGET_TRIPLET}: - ENV{VisualStudioVersion} : $ENV{VisualStudioVersion} - VCPKG_TARGET_ARCHITECTURE: ${VCPKG_TARGET_ARCHITECTURE}") - endif() - elseif(DEFINED arg_GENERATOR) - set(generator "${arg_GENERATOR}") - elseif(ninja_host) - set(generator "Ninja") - elseif(NOT VCPKG_HOST_IS_WINDOWS) - set(generator "Unix Makefiles") - endif() - - if(NOT generator) - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME "Windows") - endif() - message(FATAL_ERROR "Unable to determine appropriate generator for: " - "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") - endif() - - if(generator STREQUAL "Ninja") - vcpkg_find_acquire_program(NINJA) - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") - # If we use Ninja, it must be on PATH for CMake's ExternalProject, - # cf. https://gitlab.kitware.com/cmake/cmake/-/issues/23355. - get_filename_component(ninja_path "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${ninja_path}") - endif() - - set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - set(build_dir_debug "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - file(REMOVE_RECURSE - "${build_dir_release}" - "${build_dir_debug}") - file(MAKE_DIRECTORY "${build_dir_release}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${build_dir_debug}") - endif() - - if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") - if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 21) - endif() - endif() - - if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") - endif() - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") - elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") - else() - message(FATAL_ERROR - "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " - "It must be \"static\" or \"dynamic\"") - endif() - - z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) - z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) - z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) - - set(VCPKG_SET_CHARSET_FLAG ON) - if(arg_NO_CHARSET_FLAG) - set(VCPKG_SET_CHARSET_FLAG OFF) - endif() - - if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - z_vcpkg_select_default_vcpkg_chainload_toolchain() - endif() - - list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) - vcpkg_list(APPEND arg_OPTIONS - "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" - "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" - "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" - "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" - "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" - "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" - "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" - "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" - "-DCMAKE_VERBOSE_MAKEFILE=ON" - "-DVCPKG_APPLOCAL_DEPS=OFF" - "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" - "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" - "-DVCPKG_CXX_FLAGS=${VCPKG_CXX_FLAGS}" - "-DVCPKG_CXX_FLAGS_RELEASE=${VCPKG_CXX_FLAGS_RELEASE}" - "-DVCPKG_CXX_FLAGS_DEBUG=${VCPKG_CXX_FLAGS_DEBUG}" - "-DVCPKG_C_FLAGS=${VCPKG_C_FLAGS}" - "-DVCPKG_C_FLAGS_RELEASE=${VCPKG_C_FLAGS_RELEASE}" - "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}" - "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" - "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" - "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" - "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}" - "-DCMAKE_INSTALL_LIBDIR:STRING=lib" - "-DCMAKE_INSTALL_BINDIR:STRING=bin" - "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" - "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" - "-DVCPKG_MANIFEST_INSTALL=OFF" - "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - ) - - # Sets configuration variables for macOS builds - foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) - if(DEFINED VCPKG_${config_var}) - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") - endif() - endforeach() - - # Allow overrides / additional configuration variables from triplets - if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) - vcpkg_list(APPEND arg_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS}) - endif() - if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) - vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}) - endif() - if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) - vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}) - endif() - - vcpkg_list(SET rel_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - -G "${generator}" - ${architecture_options} - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" - ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) - vcpkg_list(SET dbg_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - -G "${generator}" - ${architecture_options} - "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" - ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) - - if(NOT arg_DISABLE_PARALLEL_CONFIGURE) - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") - - vcpkg_find_acquire_program(NINJA) - - #parallelize the configure step - set(ninja_configure_contents - "rule CreateProcess\n command = \$process\n\n" - ) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") - z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") - z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") - endif() - - file(MAKE_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure") - file(WRITE - "${build_dir_release}/vcpkg-parallel-configure/build.ninja" - "${ninja_configure_contents}") - - message(STATUS "${configuring_message}") - vcpkg_execute_required_process( - COMMAND "${NINJA}" -v - WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" - LOGNAME "${arg_LOGFILE_BASE}" - SAVE_LOG_FILES ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt ../CMakeCache.txt - ) - - vcpkg_list(APPEND config_logs - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log" - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") - else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") - message(STATUS "${configuring_message}-dbg") - vcpkg_execute_required_process( - COMMAND ${dbg_command} - WORKING_DIRECTORY "${build_dir_debug}" - LOGNAME "${arg_LOGFILE_BASE}-dbg" - SAVE_LOG_FILES CMakeCache.txt - ) - vcpkg_list(APPEND config_logs - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") - message(STATUS "${configuring_message}-rel") - vcpkg_execute_required_process( - COMMAND ${rel_command} - WORKING_DIRECTORY "${build_dir_release}" - LOGNAME "${arg_LOGFILE_BASE}-rel" - SAVE_LOG_FILES CMakeCache.txt - ) - vcpkg_list(APPEND config_logs - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" - "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log") - endif() - endif() - - set(all_unused_variables) - foreach(config_log IN LISTS config_logs) - if(NOT EXISTS "${config_log}") - continue() - endif() - file(READ "${config_log}" log_contents) - debug_message("Reading configure log ${config_log}...") - if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") - continue() - endif() - string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` - string(REPLACE "\n " ";" unused_variables "${unused_variables}") - debug_message("unused variables: ${unused_variables}") - foreach(unused_variable IN LISTS unused_variables) - if(unused_variable IN_LIST manually_specified_variables) - debug_message("manually specified unused variable: ${unused_variable}") - vcpkg_list(APPEND all_unused_variables "${unused_variable}") - else() - debug_message("unused variable (not manually specified): ${unused_variable}") - endif() - endforeach() - endforeach() - - if(DEFINED all_unused_variables) - vcpkg_list(REMOVE_DUPLICATES all_unused_variables) - vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) - message(WARNING "The following variables are not used in CMakeLists.txt: - ${all_unused_variables} -Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. -If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") - endif() - - if(NOT arg_Z_CMAKE_GET_VARS_USAGE) - set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.") - endif() -endfunction() diff --git a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake b/ports/vcpkg-cmake/vcpkg_cmake_install.cmake deleted file mode 100644 index 2bd8b4ea75f..00000000000 --- a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake +++ /dev/null @@ -1,21 +0,0 @@ -include_guard(GLOBAL) - -function(vcpkg_cmake_install) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "" "") - if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - - set(args) - foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH) - if(arg_${arg}) - list(APPEND args "${arg}") - endif() - endforeach() - - vcpkg_cmake_build( - ${args} - LOGFILE_BASE install - TARGET install - ) -endfunction() diff --git a/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch b/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch deleted file mode 100644 index 8fe2b2f5a66..00000000000 --- a/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/zconf.h.cmakein b/zconf.h.cmakein -index a7f24cc..a1b359b 100644 ---- a/zconf.h.cmakein -+++ b/zconf.h.cmakein -@@ -434,11 +434,19 @@ typedef uLong FAR uLongf; - #endif - - #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ --# define Z_HAVE_UNISTD_H -+# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1 -+# define Z_HAVE_UNISTD_H -+# elif HAVE_UNISTD_H != 0 -+# define Z_HAVE_UNISTD_H -+# endif - #endif - - #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ --# define Z_HAVE_STDARG_H -+# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1 -+# define Z_HAVE_STDARG_H -+# elif HAVE_STDARG_H != 0 -+# define Z_HAVE_STDARG_H -+# endif - #endif - - #ifdef STDC -diff --git a/zconf.h.in b/zconf.h.in -index 5e1d68a..32f53c8 100644 ---- a/zconf.h.in -+++ b/zconf.h.in -@@ -432,11 +432,19 @@ typedef uLong FAR uLongf; - #endif - - #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ --# define Z_HAVE_UNISTD_H -+# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1 -+# define Z_HAVE_UNISTD_H -+# elif HAVE_UNISTD_H != 0 -+# define Z_HAVE_UNISTD_H -+# endif - #endif - - #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ --# define Z_HAVE_STDARG_H -+# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1 -+# define Z_HAVE_STDARG_H -+# elif HAVE_STDARG_H != 0 -+# define Z_HAVE_STDARG_H -+# endif - #endif - - #ifdef STDC - diff --git a/ports/zlib/0002-skip-building-examples.patch b/ports/zlib/0002-skip-building-examples.patch deleted file mode 100644 index 8183f2ab20b..00000000000 --- a/ports/zlib/0002-skip-building-examples.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b412dc7..f46c8e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -194,6 +194,7 @@ endif() - # Example binaries - #============================================================================ - -+if (0) - add_executable(example test/example.c) - target_link_libraries(example zlib) - add_test(example example) -@@ -211,3 +212,4 @@ if(HAVE_OFF64_T) - target_link_libraries(minigzip64 zlib) - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") - endif() -+endif() diff --git a/ports/zlib/0003-build-static-or-shared-not-both.patch b/ports/zlib/0003-build-static-or-shared-not-both.patch deleted file mode 100644 index c9f2ecf1976..00000000000 --- a/ports/zlib/0003-build-static-or-shared-not-both.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f46c8e6..6fa5575 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -121,9 +121,11 @@ set(ZLIB_SRCS - ) - - if(NOT MINGW) -+ if(BUILD_SHARED_LIBS) - set(ZLIB_DLL_SRCS - win32/zlib1.rc # If present will override custom build rule below. - ) -+ endif() - endif() - - # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION -@@ -144,13 +146,16 @@ if(MINGW) - -I ${CMAKE_CURRENT_BINARY_DIR} - -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj - -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) -+ if(BUILD_SHARED_LIBS) - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) -+ endif() - endif(MINGW) - --add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -+if (BUILD_SHARED_LIBS) - set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) - set_target_properties(zlib PROPERTIES SOVERSION 1) -+endif() - - if(NOT CYGWIN) - # This property causes shared libraries on Linux to have the full version -@@ -165,7 +170,7 @@ endif() - - if(UNIX) - # On unix-like platforms the library is almost always called libz -- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) -+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() -@@ -175,7 +180,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) - endif() - - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) -- install(TARGETS zlib zlibstatic -+ install(TARGETS zlib - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) diff --git a/ports/zlib/0004-android-and-mingw-fixes.patch b/ports/zlib/0004-android-and-mingw-fixes.patch deleted file mode 100644 index e93173f2461..00000000000 --- a/ports/zlib/0004-android-and-mingw-fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6fa5575..7c345db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,7 +56,7 @@ endif() - # - check_include_file(unistd.h Z_HAVE_UNISTD_H) - --if(MSVC) -+if(WIN32) - set(CMAKE_DEBUG_POSTFIX "d") - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -@@ -133,7 +133,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) - string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" - "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) - --if(MINGW) -+if(MINGW AND NOT ANDROID) - # This gets us DLL resource information when compiling on MinGW. - if(NOT CMAKE_RC_COMPILER) - set(CMAKE_RC_COMPILER windres.exe) -@@ -149,7 +149,7 @@ if(MINGW) - if(BUILD_SHARED_LIBS) - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) - endif() --endif(MINGW) -+endif(MINGW AND NOT ANDROID) - - add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - if (BUILD_SHARED_LIBS) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake deleted file mode 100644 index 450cb2c1915..00000000000 --- a/ports/zlib/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# When this port is updated, the minizip port should be updated at the same time -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO madler/zlib - REF v1.2.13 - SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 - HEAD_REF master - PATCHES - 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch - 0002-skip-building-examples.patch - 0003-build-static-or-shared-not-both.patch - 0004-android-and-mingw-fixes.patch -) - -# This is generated during the cmake build -file(REMOVE "${SOURCE_PATH}/zconf.h") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSKIP_INSTALL_FILES=ON - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON -) - -vcpkg_cmake_install() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -# Install the pkgconfig file -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib") - endif() - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd") - endif() - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -endif() - -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 0") -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1") -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zlib/usage b/ports/zlib/usage deleted file mode 100644 index 39d8618221a..00000000000 --- a/ports/zlib/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package zlib is compatible with built-in CMake targets: - - find_package(ZLIB REQUIRED) - target_link_libraries(main PRIVATE ZLIB::ZLIB) diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 8624b70867e..00000000000 --- a/ports/zlib/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,12 +0,0 @@ -find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG)) - message(FATAL_ERROR "Broken installation of vcpkg port zlib") -endif() -if(CMAKE_VERSION VERSION_LESS 3.4) - include(SelectLibraryConfigurations) - select_library_configurations(ZLIB) - unset(ZLIB_FOUND) -endif() -_find_package(${ARGS}) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json deleted file mode 100644 index 7ef1f29d8ed..00000000000 --- a/ports/zlib/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "zlib", - "version": "1.2.13", - "description": "A compression library", - "homepage": "https://www.zlib.net/", - "license": "Zlib", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/zstd/install_pkgpc.patch b/ports/zstd/install_pkgpc.patch deleted file mode 100644 index a0582d98b21..00000000000 --- a/ports/zstd/install_pkgpc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index 5f75665..dabc9d5 100644 ---- a/build/cmake/lib/CMakeLists.txt -+++ b/build/cmake/lib/CMakeLists.txt -@@ -130,7 +130,7 @@ if (ZSTD_BUILD_STATIC) - OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME}) - endif () - --if (UNIX OR MINGW) -+if (1) - # pkg-config - set(PREFIX "${CMAKE_INSTALL_PREFIX}") - set(EXEC_PREFIX "\${prefix}") diff --git a/ports/zstd/no-static-suffix.patch b/ports/zstd/no-static-suffix.patch deleted file mode 100644 index 4e61f96b87d..00000000000 --- a/ports/zstd/no-static-suffix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index 8234060..765f003 100644 ---- a/build/cmake/lib/CMakeLists.txt -+++ b/build/cmake/lib/CMakeLists.txt -@@ -112,7 +112,7 @@ endif () - - # With MSVC static library needs to be renamed to avoid conflict with import library - if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)) -- set(STATIC_LIBRARY_BASE_NAME zstd_static) -+ set(STATIC_LIBRARY_BASE_NAME zstd) - else () - set(STATIC_LIBRARY_BASE_NAME zstd) - endif () diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake deleted file mode 100644 index 6d7aa4df883..00000000000 --- a/ports/zstd/portfile.cmake +++ /dev/null @@ -1,55 +0,0 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO facebook/zstd - REF "v${VERSION}" - SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e - HEAD_REF dev - PATCHES - install_pkgpc.patch - no-static-suffix.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/build/cmake" - OPTIONS - -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED} - -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC} - -DZSTD_LEGACY_SUPPORT=1 - -DZSTD_BUILD_PROGRAMS=0 - -DZSTD_BUILD_TESTS=0 - -DZSTD_BUILD_CONTRIB=0 - -DZSTD_MULTITHREAD_SUPPORT=1 -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) -vcpkg_fixup_pkgconfig() - -file(READ "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets.cmake" targets) -if(targets MATCHES "-pthread") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") - endif() -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(HEADER IN ITEMS zdict.h zstd.h zstd_errors.h) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${HEADER}" "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" ) - endforeach() -endif() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright( - COMMENT "ZSTD is dual licensed under BSD and GPLv2." - FILE_LIST - "${SOURCE_PATH}/LICENSE" - "${SOURCE_PATH}/COPYING" -) diff --git a/ports/zstd/usage b/ports/zstd/usage deleted file mode 100644 index f01a2f5cfb7..00000000000 --- a/ports/zstd/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package zstd provides CMake targets: - - find_package(zstd CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json deleted file mode 100644 index d683b33e7de..00000000000 --- a/ports/zstd/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "zstd", - "version": "1.5.2", - "port-version": 3, - "description": "Zstandard - Fast real-time compression algorithm", - "homepage": "https://facebook.github.io/zstd/", - "license": "BSD-3-Clause OR GPL-2.0-only", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/test/src/unit-cppapi-global-order-writes-remote.cc b/test/src/unit-cppapi-global-order-writes-remote.cc index 2bdfb4eddfc..5feee0c1210 100644 --- a/test/src/unit-cppapi-global-order-writes-remote.cc +++ b/test/src/unit-cppapi-global-order-writes-remote.cc @@ -36,6 +36,7 @@ #include #include +#include using namespace tiledb; diff --git a/test/src/unit-dimension.cc b/test/src/unit-dimension.cc index 366903ac7bd..990790d7941 100644 --- a/test/src/unit-dimension.cc +++ b/test/src/unit-dimension.cc @@ -273,7 +273,7 @@ TEST_CASE( TEST_CASE( "Dimension: Test map_to_uint64, float32", - "[dimension][map_to_uint64][float32") { + "[dimension][map_to_uint64][float32]") { // Create dimensions Dimension d1("d1", Datatype::FLOAT32); float dom1[] = {0.0f, 1.0f}; diff --git a/test/src/unit-enumerations.cc b/test/src/unit-enumerations.cc index ba2b686aa45..6d9ae77052d 100644 --- a/test/src/unit-enumerations.cc +++ b/test/src/unit-enumerations.cc @@ -2073,7 +2073,7 @@ TEST_CASE_METHOD( TEST_CASE_METHOD( EnumerationFx, "Cap'N Proto - Basic New ArraySchema Serialization", - "[enumeration][capnp][basic][initialized-in-ram") { + "[enumeration][capnp][basic][initialized-in-ram]") { auto client_side = GENERATE(true, false); auto ser_type = GENERATE(SerializationType::CAPNP, SerializationType::JSON); diff --git a/vcpkg.json b/vcpkg.json index 86a75075b40..c8b9831f013 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,5 @@ { - "name": "tiledb", - "version-string": "2.15.0", - "builtin-baseline": "c0b1007fe7fc6ccc902e6c708fd6a670ddad8f9d", + "builtin-baseline": "72010900b7cee36cea77aebb97695095c9358eaf", "dependencies": [ "bzip2", "libmagic", @@ -18,16 +16,9 @@ "azure": { "description": "Support Azure Blob Storage", "dependencies": [ - { - "name": "azure-storage-blobs-cpp", - "version>=": "12.6.1" - }, + "azure-storage-blobs-cpp", { "name": "libxml2", - "features": [ - "lzma", - "zlib" - ], "default-features": false, "platform": "!windows" } @@ -38,7 +29,6 @@ "dependencies": [ { "name": "google-cloud-cpp", - "version>=": "2.15.1", "features": [ "storage" ], @@ -59,10 +49,7 @@ "name": "curl", "features": [ "zstd" ] }, - { - "name": "capnproto", - "version>=": "1.0.1" - } + "capnproto" ] }, "s3": { @@ -70,7 +57,6 @@ "dependencies": [ { "name": "aws-sdk-cpp", - "version>=": "1.11.160", "features": ["s3", "identity-management", "sts"], "default-features": false } @@ -91,21 +77,15 @@ "webp": { "description": "Support WebP compression", "dependencies": [ - { - "name": "libwebp", - "version>=": "1.3.2" - } + "libwebp" ] } }, "overrides": [ { - "name": "abseil", - "version": "20230802.1" - }, - { - "name": "curl", - "version": "8.4.0" + "$note": "Remove this when the custom port for libmagic gets removed", + "name": "dirent", + "version": "1.23.2#3" } ] }