From 692af196c9bca360f98cb85d68201176aa1fb561 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:34:30 +0200 Subject: [PATCH] [gcem] Update to 1.14.1 (#24183) * Update gcem to 1.14.1 * Update CI baseline Co-authored-by: chausner --- ports/gcem/portfile.cmake | 19 +++++++++---------- ports/gcem/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 4 ++-- versions/g-/gcem.json | 5 +++++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake index 7d7a7124aa..86d33636ba 100644 --- a/ports/gcem/portfile.cmake +++ b/ports/gcem/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kthohr/gcem - REF a20b0fc0206ff7d99a96fe4afdfe8205b01c8220 # v1.13.1 - SHA512 baede14856ddcf8f132c7a16b19d4d646a1fc2d5e3a536a46694a8d7c656ce4ffb2fd61f50a1df78ce7ed31528828152b4e881fe10bcead553985b6103018804 + REF v1.14.1 + SHA512 c4d6d50b541d71552ef5c3467bc2abe448a08627964c612abcfacc381b0f07399bdd03643e0914ad3c89116c3eae37ed96ee2cfce35d7ec47e6c0f53bab91f57 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gcem) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gcem) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gcem/vcpkg.json b/ports/gcem/vcpkg.json index ef9aef7151..e7a9772996 100644 --- a/ports/gcem/vcpkg.json +++ b/ports/gcem/vcpkg.json @@ -1,6 +1,17 @@ { "name": "gcem", - "version-string": "1.13.1", - "port-version": 1, - "description": "A C++ compile-time math library using generalized constant expressions" + "version": "1.14.1", + "description": "A C++ compile-time math library using generalized constant expressions", + "homepage": "https://www.kthohr.com/gcem.html", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1437b3cef5..d9e9e5d06c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2421,8 +2421,8 @@ "port-version": 0 }, "gcem": { - "baseline": "1.13.1", - "port-version": 1 + "baseline": "1.14.1", + "port-version": 0 }, "gdal": { "baseline": "3.4.2", diff --git a/versions/g-/gcem.json b/versions/g-/gcem.json index 7753c48bdb..29d714d2ba 100644 --- a/versions/g-/gcem.json +++ b/versions/g-/gcem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01116231bfab30197748230d4125d18fd2652150", + "version": "1.14.1", + "port-version": 0 + }, { "git-tree": "b5ffa19fc8b11179434020c69f6c998dd58268ee", "version-string": "1.13.1",