diff --git a/ports/ignition-utils1/portfile.cmake b/ports/ignition-utils1/portfile.cmake index dd54204f3c..7d8a55ff60 100644 --- a/ports/ignition-utils1/portfile.cmake +++ b/ports/ignition-utils1/portfile.cmake @@ -1,29 +1,6 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO gazebosim/gz-utils - REF ignition-utils1_1.4.0 - SHA512 f7c841391b0f523ed631c00d8053c52c3a52f409fb76faf68565ae2db96424c79e91a4bdcab650acfc35c17fe7f1df6881de4b59d5210539ebe8e9cfef991461 - HEAD_REF ign-utils1 -) +set(PACKAGE_VERSION "1.5.1") +ignition_modular_library(NAME utils + VERSION ${PACKAGE_VERSION} + REF "ignition-utils1_${PACKAGE_VERSION}" + SHA512 ede208d98b0b4bc4bfe38e248e8eb89da8feaced547e968a2a733992d86c632a9fae724c7c97e4a962ba36e23663a5872017eeae0b818492fcd1eca9d9643653) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() - -# Fix cmake targets and pkg-config file location -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ignition-utils1") -vcpkg_fixup_pkgconfig() - -# Remove debug files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/include/ignition/utils1/ignition/utils/cli" -) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ignition-utils1/vcpkg.json b/ports/ignition-utils1/vcpkg.json index 1401310a19..8d55782f6a 100644 --- a/ports/ignition-utils1/vcpkg.json +++ b/ports/ignition-utils1/vcpkg.json @@ -1,17 +1,13 @@ { "name": "ignition-utils1", - "version": "1.4.0", + "version": "1.5.1", "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.", "homepage": "https://gazebosim.org", "license": "Apache-2.0", "dependencies": [ "ignition-cmake2", { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", + "name": "ignition-modularscripts", "host": true } ] diff --git a/versions/baseline.json b/versions/baseline.json index 6e15d6f859..f49a15fa77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3341,7 +3341,7 @@ "port-version": 4 }, "ignition-utils1": { - "baseline": "1.4.0", + "baseline": "1.5.1", "port-version": 0 }, "igraph": { diff --git a/versions/i-/ignition-utils1.json b/versions/i-/ignition-utils1.json index 557ef40996..439b5022e0 100644 --- a/versions/i-/ignition-utils1.json +++ b/versions/i-/ignition-utils1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d8c75978b3991ee12215ce61e06993e30634aa", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "020c2c9b24d3d0a0d627a762e4c780ba1af2e154", "version": "1.4.0",