mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 01:30:55 +08:00
[geos] Fix msvc 2017 (#41728)
This commit is contained in:
parent
8c7c556d60
commit
2c6040c23c
@ -3,11 +3,17 @@ vcpkg_download_distfile(ARCHIVE
|
||||
FILENAME "geos-${VERSION}.tar.bz2"
|
||||
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
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
SOURCE_BASE "v${VERSION}"
|
||||
PATCHES
|
||||
fix-exported-config.patch
|
||||
"${msvc_2017_patch}"
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,10 +1,14 @@
|
||||
The package geos provides CMake targets:
|
||||
geos provides CMake targets:
|
||||
|
||||
# C API (provides long-term ABI stability)
|
||||
find_package(GEOS CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE GEOS::geos_c)
|
||||
# C API (provides long-term ABI stability)
|
||||
find_package(GEOS CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE GEOS::geos_c)
|
||||
|
||||
# C++ API (will likely change across versions)
|
||||
find_package(GEOS CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE GEOS::geos)
|
||||
# C++ API (will likely change across versions)
|
||||
find_package(GEOS CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE GEOS::geos)
|
||||
|
||||
geos provides pkg-config modules:
|
||||
|
||||
# Geometry Engine, Open Source - C API
|
||||
geos
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "geos",
|
||||
"version": "3.13.0",
|
||||
"port-version": 1,
|
||||
"description": "Geometry Engine Open Source",
|
||||
"homepage": "https://libgeos.org/",
|
||||
"license": "LGPL-2.1-only",
|
||||
|
@ -3046,7 +3046,7 @@
|
||||
},
|
||||
"geos": {
|
||||
"baseline": "3.13.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"geotrans": {
|
||||
"baseline": "3.9",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "331bb2a4ee2ca09a1d85f801bf3eb52a0ebb2acf",
|
||||
"version": "3.13.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "0d124c642d54c1764b3d750e6e8800c0f830c51a",
|
||||
"version": "3.13.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user