diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 558003b0..d46b1050 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -244,7 +244,7 @@ jobs: id: highway if: steps.vcpkg.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install highway --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install highway --triplet ${{ matrix.triplet }} - name: Read highway config if: steps.highway.outcome == 'success' || steps.highway.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index 35900c78..e4c7eddd 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 | | [libxslt](http://xmlsoft.org/libxslt) | 1.1.42 | 2024-07-04 | | [lcms](https://www.littlecms.com/) | 2.16.0 | 2023-12-03 | -| [highway](https://github.com/google/highway) | 1.2.0 | 2024-05-31 | | [libpng](http://www.libpng.org/pub/png/libpng.html) | 1.6.44 | 2024-09-12 | | [libwebp](https://github.com/webmproject/libwebp) | 1.4.0 | 2024-04-12 | | [libjxl](https://github.com/libjxl/libjxl) | 0.11.0 | 2024-09-13 | diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake deleted file mode 100644 index 01ba9426..00000000 --- a/ports/highway/portfile.cmake +++ /dev/null @@ -1,46 +0,0 @@ -set(VERSION 1.2.0) - -set(FILENAME "highway-${VERSION}.tar.gz") -set(URLS "https://github.com/google/highway/releases/download/${VERSION}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 34b2204eafaec8e092d970831881d757c4131288db4fac12d6f0e6cf7c0a36ca8c029ce888118803dd196831fe8c26d54c7c4bfc4c6d177220f50f67e63d0d87 -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -set(BUILD_OPTIONS - -DHWY_ENABLE_CONTRIB=OFF - -DHWY_ENABLE_EXAMPLES=OFF - -DHWY_ENABLE_INSTALL=ON - -DHWY_ENABLE_TESTS=OFF - - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${BUILD_OPTIONS} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hwy) -vcpkg_fixup_pkgconfig() - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/highway RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/highway/version ${VERSION}) diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json deleted file mode 100644 index 8f796a32..00000000 --- a/ports/highway/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "highway", - "version": "1.2.0", - "description": "Performance-portable, length-agnostic SIMD with runtime dispatch.", - "homepage": "https://github.com/google/highway", - "license": "Apache-2.0", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}