mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[geos] Fix msvc 2017 (#41728)

Browse Source
This commit is contained in:
Kai Pastor 2024-10-24 04:39:29 +02:00 committed by GitHub
parent 8c7c556d60
commit 2c6040c23c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/geos/portfile.cmake
View File

@ -3,11 +3,17 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "geos-${VERSION}.tar.bz2" FILENAME "geos-${VERSION}.tar.bz2"
SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28 SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28
) )
vcpkg_download_distfile(msvc_2017_patch
URLS https://github.com/libgeos/geos/commit/46e9f158073ebf0d4ec8b7dde37c155d097bc0d7.diff?full_index=1
SHA512 9fa1ccc4c66e8268c59bcac218015c2b10ee594bece837e6d0fc78fe700233abd1b2df7aa396c00786ffb170fbfbb0ab530f5007ba10376a2366ee3472d8b02a
FILENAME geos-${VERSION}-msvc-2017.diff
)
vcpkg_extract_source_archive(SOURCE_PATH vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${ARCHIVE}" ARCHIVE "${ARCHIVE}"
SOURCE_BASE "v${VERSION}" SOURCE_BASE "v${VERSION}"
PATCHES PATCHES
fix-exported-config.patch fix-exported-config.patch
"${msvc_2017_patch}"
) )
vcpkg_cmake_configure( vcpkg_cmake_configure(

18
ports/geos/usage
View File

@ -1,10 +1,14 @@
The package geos provides CMake targets: geos provides CMake targets:
# C API (provides long-term ABI stability) # C API (provides long-term ABI stability)
find_package(GEOS CONFIG REQUIRED) find_package(GEOS CONFIG REQUIRED)
target_link_libraries(main PRIVATE GEOS::geos_c) target_link_libraries(main PRIVATE GEOS::geos_c)
# C++ API (will likely change across versions) # C++ API (will likely change across versions)
find_package(GEOS CONFIG REQUIRED) find_package(GEOS CONFIG REQUIRED)
target_link_libraries(main PRIVATE GEOS::geos) target_link_libraries(main PRIVATE GEOS::geos)
geos provides pkg-config modules:
# Geometry Engine, Open Source - C API
geos

1
ports/geos/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "geos", "name": "geos",
"version": "3.13.0", "version": "3.13.0",
"port-version": 1,
"description": "Geometry Engine Open Source", "description": "Geometry Engine Open Source",
"homepage": "https://libgeos.org/", "homepage": "https://libgeos.org/",
"license": "LGPL-2.1-only", "license": "LGPL-2.1-only",

2
versions/baseline.json
View File

@ -3046,7 +3046,7 @@
}, },
"geos": { "geos": {
"baseline": "3.13.0", "baseline": "3.13.0",
"port-version": 0 "port-version": 1
}, },
"geotrans": { "geotrans": {
"baseline": "3.9", "baseline": "3.9",

5
versions/g-/geos.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "331bb2a4ee2ca09a1d85f801bf3eb52a0ebb2acf",
"version": "3.13.0",
"port-version": 1
},
{ {
"git-tree": "0d124c642d54c1764b3d750e6e8800c0f830c51a", "git-tree": "0d124c642d54c1764b3d750e6e8800c0f830c51a",
"version": "3.13.0", "version": "3.13.0",