From 415636006034adae2959d8ea0f4c4b275df07ac0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:53:45 +0100 Subject: [PATCH] [libdivide] Update to 5.0 (#21388) * Update libdivide to 5.0 * Update CI baseline Co-authored-by: chausner --- ports/libdivide/portfile.cmake | 33 +++++++++++++++++---------------- ports/libdivide/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/l-/libdivide.json | 5 +++++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/ports/libdivide/portfile.cmake b/ports/libdivide/portfile.cmake index 32ea56b258..78f42e5bd6 100644 --- a/ports/libdivide/portfile.cmake +++ b/ports/libdivide/portfile.cmake @@ -1,32 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ridiculousfish/libdivide - REF v4.0.0 - SHA512 662b8f479c3f822563d4f1c85c77c204f47e992391cd5ca3376d6e19e4d2132c28ad59b8e3179edd706fceeabf0d1bc7be5e713eeb669523952155a2d7770326 + REF 5.0 + SHA512 89581efab63a0668405196d4d8188e03f3b87027e9014ef7238e1d79fe369d8abbca0e44b00cf02b00be29c272feb34c9b9290313596adbef9b46ae0715c29dd HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - test BUILD_TESTS + test BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - -DLIBDIVIDE_SSE2=OFF - -DLIBDIVIDE_AVX2=OFF - -DLIBDIVIDE_AVX512=OFF - -DENABLE_VECTOR_EXTENSIONS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBDIVIDE_SSE2=OFF + -DLIBDIVIDE_AVX2=OFF + -DLIBDIVIDE_AVX512=OFF + -DLIBDIVIDE_NEON=OFF + -DENABLE_VECTOR_EXTENSIONS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdivide/vcpkg.json b/ports/libdivide/vcpkg.json index 5ae8145751..ff29d9d5d3 100644 --- a/ports/libdivide/vcpkg.json +++ b/ports/libdivide/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libdivide", - "version-string": "4.0.0", - "port-version": 1, + "version": "5.0", "description": "libdivide.h is a header-only C/C++ library for optimizing integer division.", "homepage": "https://github.com/ridiculousfish/libdivide", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "test": { "description": "Build test" diff --git a/versions/baseline.json b/versions/baseline.json index aced314db7..d09bf11820 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3385,8 +3385,8 @@ "port-version": 8 }, "libdivide": { - "baseline": "4.0.0", - "port-version": 1 + "baseline": "5.0", + "port-version": 0 }, "libdjinterop": { "baseline": "0.16.0", diff --git a/versions/l-/libdivide.json b/versions/l-/libdivide.json index 747b96345c..ac46b6fe3f 100644 --- a/versions/l-/libdivide.json +++ b/versions/l-/libdivide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b13f3b926e61d104e85e04bf192fabe29cd5f05e", + "version": "5.0", + "port-version": 0 + }, { "git-tree": "a632ce1c591ebeff2d020222f9a7cac938d3a623", "version-string": "4.0.0",