From 25e38b64d31fdf004d3e06cdb843996b0dd00b65 Mon Sep 17 00:00:00 2001 From: Lassi Date: Fri, 1 Oct 2021 01:45:01 +0300 Subject: [hypodermic] added version 2.5.3, updated baseline (#20414) * added 2.5.3, updated baseline * added quotes and fixed how license installation is done * updated portfile based on bots recommendations * Change version-semver to version. Co-authored-by: Billy Robert O'Neal III --- ports/hypodermic/portfile.cmake | 18 +++++++----------- ports/hypodermic/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/h-/hypodermic.json | 5 +++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ports/hypodermic/portfile.cmake b/ports/hypodermic/portfile.cmake index 9e1f2fd98..ec58f3c49 100644 --- a/ports/hypodermic/portfile.cmake +++ b/ports/hypodermic/portfile.cmake @@ -1,26 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ybainier/Hypodermic - REF 3e86a5a1fd5e8279d6ca461f9f398fa3f3c2eddc # v2.5.2 - SHA512 1af2a94037aa5bf8c65aceb4a2e941f7f6d016422d345f86280085115e9bb871387370158b1a83891be8efdadd4eea0a1f8905225ebee64c000ec9023a9f212e + REF 0e0d85d70aa2f2391dfd84f8af4a3863d4fb1611 # v2.5.3 + SHA512 6fc3f9eca034a4de3f7086bd51e9ba11ee31c8ec000a3e0bdfc06db1f3c12a89b66793adf5d219441e680541e26acaef72d21f9dd0acf3f5fee3aa12d3fb7b4d HEAD_REF master PATCHES "disable_hypodermic_tests.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" ) # Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/hypodermic/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/hypodermic/LICENSE ${CURRENT_PACKAGES_DIR}/share/hypodermic/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/hypodermic/vcpkg.json b/ports/hypodermic/vcpkg.json index c36a5eec7..6bef7aa6b 100644 --- a/ports/hypodermic/vcpkg.json +++ b/ports/hypodermic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hypodermic", - "version-string": "2.5.2", + "version": "2.5.3", "description": "Hypodermic is a non-intrusive header only IoC container for C++", "homepage": "https://github.com/ybainier/Hypodermic", "license": "MIT", @@ -11,6 +11,14 @@ "boost-range", "boost-signals2", "boost-system", - "boost-test" + "boost-test", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b513a6370..58df68a86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2669,7 +2669,7 @@ "port-version": 2 }, "hypodermic": { - "baseline": "2.5.2", + "baseline": "2.5.3", "port-version": 0 }, "hypre": { diff --git a/versions/h-/hypodermic.json b/versions/h-/hypodermic.json index 0712716e0..ceb3ab656 100644 --- a/versions/h-/hypodermic.json +++ b/versions/h-/hypodermic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b25c37438cbd5b8c8851c91413e1f671ebe1436", + "version": "2.5.3", + "port-version": 0 + }, { "git-tree": "94648decd2043ffd566f58a1d5c826835bb33aca", "version-string": "2.5.2", -- cgit v1.2.3