diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-10-06 03:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 18:39:42 -0700 |
| commit | c8fe3a53f7500b0cf038fab7dd28fee06e31b251 (patch) | |
| tree | c95789a49faf657236380a5ed197b9acbf3f91e6 | |
| parent | e075169d0fe606ed92638fcfa5e1d776a37d1c48 (diff) | |
| download | vcpkg-c8fe3a53f7500b0cf038fab7dd28fee06e31b251.tar.gz vcpkg-c8fe3a53f7500b0cf038fab7dd28fee06e31b251.zip | |
[geos] Install pc file also for Windows (#20502)
* Install pc file for msvc
* Fix warning about unused cmake variable
* Update version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/geos/pc-file-for-msvc.patch | 15 | ||||
| -rw-r--r-- | ports/geos/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/geos/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/geos.json | 5 |
5 files changed, 25 insertions, 3 deletions
diff --git a/ports/geos/pc-file-for-msvc.patch b/ports/geos/pc-file-for-msvc.patch new file mode 100644 index 000000000..ad79be072 --- /dev/null +++ b/ports/geos/pc-file-for-msvc.patch @@ -0,0 +1,15 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index d9267e8..26713f9 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -36,6 +36,10 @@ if(NOT MSVC) + OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) ++else() ++ set(cxx_libs "") ++endif() ++if(1) + + # pkg-config support + configure_file( diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 017db4953..fe8f8b0a5 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( dont-build-docs.patch dont-build-astyle.patch pc-file-libs-private.patch + pc-file-for-msvc.patch make-geos-config-relocatable.patch fix-static-deps.patch ) @@ -29,10 +30,11 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DEBUG_POSTFIX=d -DBUILD_TESTING=OFF -DBUILD_BENCHMARKS=OFF ${_CMAKE_EXTRA_OPTIONS} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS) diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 0df73d3c4..851c5dcdc 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geos", "version": "3.9.1", - "port-version": 2, + "port-version": 3, "description": "Geometry Engine Open Source", "homepage": "https://www.osgeo.org/projects/geos/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cdbb9f26c..ccfde840c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "geos": { "baseline": "3.9.1", - "port-version": 2 + "port-version": 3 }, "geotrans": { "baseline": "3.8", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index dbe7c058a..0f7002ddb 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e", + "version": "3.9.1", + "port-version": 3 + }, + { "git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5", "version": "3.9.1", "port-version": 2 |