From 018ba5ae0bf08c6fc93ff9c8de3b8641c4116141 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:03:22 +0800 Subject: [PATCH] [crossguid] update to latest commit (#20922) * [crossguid] update to latest commit * [crossguid] update to latest commit * update version * add * update version --- ports/crossguid/portfile.cmake | 17 ++++++++--------- ports/crossguid/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/c-/crossguid.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake index 7e9b0c76f1..f390d92c1b 100644 --- a/ports/crossguid/portfile.cmake +++ b/ports/crossguid/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO graeme-hill/crossguid - REF c4f8e9b21f779abe287c022e73eeac365d430337 - SHA512 38876f410d0014ad930b720312cecc99be1361b9810a21d5ffc1deba6221ea0e2aebd0da332adb18fd314d0477fd33410403120629b8df405bb64a9884e3d0b0 + REF ca1bf4b810e2d188d04cb6286f957008ee1b7681 #2021-10-22 + SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCROSSGUID_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/crossguid/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/crossguid/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/crossguid/LICENSE ${CURRENT_PACKAGES_DIR}/share/crossguid/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/crossguid/vcpkg.json b/ports/crossguid/vcpkg.json index 0532bad663..d8fe3c1076 100644 --- a/ports/crossguid/vcpkg.json +++ b/ports/crossguid/vcpkg.json @@ -1,12 +1,19 @@ { "name": "crossguid", - "version-string": "0.2.2-2018-06-16", - "port-version": 2, + "version-date": "2021-10-22", "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", "dependencies": [ { "name": "libuuid", "platform": "!windows & !uwp & !osx & !android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index ff2213be47..4e4e0eac3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1641,8 +1641,8 @@ "port-version": 2 }, "crossguid": { - "baseline": "0.2.2-2018-06-16", - "port-version": 2 + "baseline": "2021-10-22", + "port-version": 0 }, "crow": { "baseline": "0.3.3", diff --git a/versions/c-/crossguid.json b/versions/c-/crossguid.json index 0bed5bcf10..e516a9d081 100644 --- a/versions/c-/crossguid.json +++ b/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5880c01322b2c2cd08e9b573b769260696b2365d", + "version-date": "2021-10-22", + "port-version": 0 + }, { "git-tree": "42cc44d6649705d3c104e9753f3ba1bb4217ebc8", "version-string": "0.2.2-2018-06-16",