From c264dba458a47b1345c37f3a02af46aab772bd18 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 4 Oct 2021 17:15:24 -0700 Subject: [PATCH] [expected-lite] Update port to 0.5.0 (#20455) * update to 0.5.0 * fixup deprecated functions * quote paths * use semver * add homepage * update versioning * add HEAD_REF * update versioning * use `version` instead * update versioning --- ports/expected-lite/portfile.cmake | 20 ++++++++++---------- ports/expected-lite/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/e-/expected-lite.json | 5 +++++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake index fcd73e9b74c39b..33079f6746144a 100644 --- a/ports/expected-lite/portfile.cmake +++ b/ports/expected-lite/portfile.cmake @@ -1,29 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/expected-lite - REF v0.3.0 - SHA512 b24b58ff7bd6d5f355935854b6b5e67c7e9b2f1b6383ecdd2a1655833f414fd1189a07000b40c45a6df8a8641602c5eca19eb5e8639ac6cfe59e3d94bc102ab3 + REF v0.5.0 + SHA512 6dd8974d518db0c79fe7bd0e407a85436c6ad222f8e5ed84efb34925d9a665b5b83ff08529b3e985034ed9a9201c80575f6a956132408ef6577c9c47cac55eae + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEXPECTED_LITE_OPT_BUILD_TESTS=OFF -DEXPECTED_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/${PORT} ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/expected-lite/vcpkg.json b/ports/expected-lite/vcpkg.json index f80f0abfff0012..3093555aabb987 100644 --- a/ports/expected-lite/vcpkg.json +++ b/ports/expected-lite/vcpkg.json @@ -1,6 +1,16 @@ { "name": "expected-lite", - "version-string": "0.3.0", - "port-version": 1, - "description": "Expected objects in C++11 and later in a single-file header-only library" + "version": "0.5.0", + "description": "Expected objects in C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/expected-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index fc6d1374fe7003..2b1e8b81f660ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2017,8 +2017,8 @@ "port-version": 0 }, "expected-lite": { - "baseline": "0.3.0", - "port-version": 1 + "baseline": "0.5.0", + "port-version": 0 }, "exprtk": { "baseline": "2021-01-01", diff --git a/versions/e-/expected-lite.json b/versions/e-/expected-lite.json index 4c59a26580c348..2cd69539cbebf8 100644 --- a/versions/e-/expected-lite.json +++ b/versions/e-/expected-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1e36e579144b5ebf1231aac06fbfc89c300351f", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "877f85638b2a3f618c48729a2e39149effbcb851", "version-string": "0.3.0",