From 80d946ae59c33c96b3947ac6fa9985133b3f608f Mon Sep 17 00:00:00 2001 From: Eisenheim9 Date: Tue, 3 Sep 2024 20:58:19 +0200 Subject: [PATCH] [clipper2] update to 1.4.0 (#40736) --- ports/clipper2/portfile.cmake | 3 ++- ports/clipper2/usage | 9 +++++++++ ports/clipper2/vcpkg.json | 7 +++++-- versions/baseline.json | 4 ++-- versions/c-/clipper2.json | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/clipper2/portfile.cmake b/ports/clipper2/portfile.cmake index a61f4f268d..66c9c308d0 100644 --- a/ports/clipper2/portfile.cmake +++ b/ports/clipper2/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AngusJohnson/Clipper2 REF "Clipper2_${VERSION}" - SHA512 64028ab0610dc2b44e48a299d8498de59807f36d8471c4758e3bbf87de682b0d0a29d027a495f36dd5432737cedc44f09a8336f0d620846d58616244c72e226c + SHA512 91036e81244f3615095d7cd8522f9c4a32ea66f802e3d190393eb8939e1a706b69c69c3a5b7c6522235c075dd6ecd45f21bffb47448ba72191ddcf05e9e93128 HEAD_REF main ) @@ -19,6 +19,7 @@ vcpkg_cmake_configure( -DCLIPPER2_UTILS=ON ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/clipper2/usage b/ports/clipper2/usage index 8670c02ccf..42e883d7ed 100644 --- a/ports/clipper2/usage +++ b/ports/clipper2/usage @@ -10,3 +10,12 @@ The package clipper2 can be imported via CMake FindPkgConfig module: pkg_check_modules(Clipper2Z REQUIRED IMPORTED_TARGET Clipper2Z) target_link_libraries(main PkgConfig::Clipper2Z) +clipper2 provides CMake targets: + + # Clipper2 + find_package(Clipper2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE Clipper2::Clipper2) + + # Clipper2Z + find_package(Clipper2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE Clipper2::Clipper2Z) diff --git a/ports/clipper2/vcpkg.json b/ports/clipper2/vcpkg.json index 2eafd25b46..b3ed527806 100644 --- a/ports/clipper2/vcpkg.json +++ b/ports/clipper2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "clipper2", - "version": "1.3.0", - "port-version": 1, + "version": "1.4.0", "description": "Polygon Clipping and Offsetting", "homepage": "http://www.angusj.com/clipper2", "license": "BSL-1.0", @@ -9,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 76874df25e..0580eb740b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1701,8 +1701,8 @@ "port-version": 2 }, "clipper2": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.4.0", + "port-version": 0 }, "clockutils": { "baseline": "1.1.1", diff --git a/versions/c-/clipper2.json b/versions/c-/clipper2.json index 0a3a6cc461..47f7e5ec35 100644 --- a/versions/c-/clipper2.json +++ b/versions/c-/clipper2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b7c4d5dff8e0b28ad089e870674d497d4be1adb", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "666b9d81d31d70d3d691e2286d951168c5d9d970", "version": "1.3.0",