From e56dde5d4987053baba1dc06abc76013e26af796 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:46:17 +0100 Subject: [PATCH] [fruit] Update to 3.7.0 (#29103) * Update fruit to 3.7.0 * Update CI baseline Co-authored-by: chausner --- ports/fruit/portfile.cmake | 9 ++++----- ports/fruit/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/f-/fruit.json | 5 +++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ports/fruit/portfile.cmake b/ports/fruit/portfile.cmake index 8fc652387e..c4bf8ed313 100644 --- a/ports/fruit/portfile.cmake +++ b/ports/fruit/portfile.cmake @@ -2,21 +2,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/fruit - REF 29c9fd265cfa72ee72fb64257fe4b72198d87264 # v3.6.0 - SHA512 1a8f5b126492dd81fe40bbedd0ead839fd25dac6ea569dd51879e288a4c5850c6618754547ac201d82875781ee0490261372df7a0d1cf50e90c3a9b9da9aaed4 + REF v3.7.0 + SHA512 6a18f2740fc52672de49f082b5a21d0a236520da83e77806935baca5d5a0b41f75f1d1b6729cad13fc77b0f033d7d8d2158fd58b1e565a7662bd80dc7eb63ba1 HEAD_REF master ) # TODO: Make boost an optional dependency? -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DFRUIT_USES_BOOST=False -DFRUIT_TESTS_USE_PRECOMPILED_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright diff --git a/ports/fruit/vcpkg.json b/ports/fruit/vcpkg.json index b182643b35..d72d26513f 100644 --- a/ports/fruit/vcpkg.json +++ b/ports/fruit/vcpkg.json @@ -1,7 +1,13 @@ { "name": "fruit", - "version-string": "3.6.0", - "port-version": 1, + "version": "3.7.0", "description": "Fruit, a dependency injection framework for C++ by Google", - "homepage": "https://github.com/google/fruit" + "homepage": "https://github.com/google/fruit", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 542d5134ad..fe23d38d78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,8 +2521,8 @@ "port-version": 0 }, "fruit": { - "baseline": "3.6.0", - "port-version": 1 + "baseline": "3.7.0", + "port-version": 0 }, "ftgl": { "baseline": "2022-05-18", diff --git a/versions/f-/fruit.json b/versions/f-/fruit.json index 5c7fb90e9a..286b7f39bb 100644 --- a/versions/f-/fruit.json +++ b/versions/f-/fruit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3877043f08c074020d222a58e552523c15923b63", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "630ff582ea6cdbf31ba5eef0656e84018f901f1e", "version-string": "3.6.0",