From 05d00352101430bc42920947253d0535e321ca1c Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Sat, 6 Aug 2022 10:47:46 +0400 Subject: [PATCH] [nameof] Update to 0.10.2 (#26168) * [nameof] Update to 0.10.2 * vcpkg x-add-version nameof * modernization * overwrite-version * license * overwrite-version * fix review * overwrite-version --- ports/nameof/portfile.cmake | 17 ++++++++--------- ports/nameof/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/n-/nameof.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/nameof/portfile.cmake b/ports/nameof/portfile.cmake index 52230b40783..4b4ba12fce7 100644 --- a/ports/nameof/portfile.cmake +++ b/ports/nameof/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.10.1 - SHA512 9b3ed7a3f5dcf1ad309341102d2aaa07fc8e9d6db7e08e42c2d9b5453c822ec16d6c6910adf7c4af8879c4084cac362f4fb4c07559cc49594b72b4917816ef5d + REF v0.10.2 + SHA512 1ec508378d12eb4a65da1bee8011302f65e78bbcab82aae716afc673665af5283a5aae5f1d0de85c7d6f59bb7268e02fc01b171f50de26bb86dc27c3b46097fa HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNAMEOF_OPT_BUILD_EXAMPLES=OFF -DNAMEOF_OPT_BUILD_TESTS=OFF -DNAMEOF_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nameof TARGET_PATH share/nameof) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/nameof/vcpkg.json b/ports/nameof/vcpkg.json index 78bce0d8e05..47f997a2dac 100644 --- a/ports/nameof/vcpkg.json +++ b/ports/nameof/vcpkg.json @@ -1,7 +1,17 @@ { "name": "nameof", - "version-string": "0.10.1", - "port-version": 1, + "version": "0.10.2", "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", - "homepage": "https://github.com/Neargye/nameof" + "homepage": "https://github.com/Neargye/nameof", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4d0146dccb4..05943f54f14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4821,8 +4821,8 @@ "port-version": 3 }, "nameof": { - "baseline": "0.10.1", - "port-version": 1 + "baseline": "0.10.2", + "port-version": 0 }, "nana": { "baseline": "1.7.4", diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index 2bce04d6369..9db7ec0e2c5 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e74d9d06b8f8982ecfbad4b07e5215c8ea054b", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "73b076af7e5bb74d8531885c3172ccdea74bce80", "version-string": "0.10.1",