Skip to content

[geos] Install pc file also for Windows #20502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 4 commits into from
Oct 6, 2021
Merged

[geos] Install pc file also for Windows #20502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5899e99
Install pc file for msvc
dg0yt Oct 3, 2021
076e2f7
Fix warning about unused cmake variable
dg0yt Oct 4, 2021
f2b291e
Update version
dg0yt Oct 4, 2021
9c793f3
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ports/geos/pc-file-for-msvc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
4 changes: 3 additions & 1 deletion ports/geos/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/geos/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@
},
"geos": {
"baseline": "3.9.1",
"port-version": 2
"port-version": 3
},
"geotrans": {
"baseline": "3.8",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/geos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e",
"version": "3.9.1",
"port-version": 3
},
{
"git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5",
"version": "3.9.1",
Expand Down