mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 03:35:28 +08:00
[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>
This commit is contained in:
parent
e075169d0f
commit
c8fe3a53f7
15
ports/geos/pc-file-for-msvc.patch
Normal file
15
ports/geos/pc-file-for-msvc.patch
Normal file
@ -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(
|
@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
|
|||||||
dont-build-docs.patch
|
dont-build-docs.patch
|
||||||
dont-build-astyle.patch
|
dont-build-astyle.patch
|
||||||
pc-file-libs-private.patch
|
pc-file-libs-private.patch
|
||||||
|
pc-file-for-msvc.patch
|
||||||
make-geos-config-relocatable.patch
|
make-geos-config-relocatable.patch
|
||||||
fix-static-deps.patch
|
fix-static-deps.patch
|
||||||
)
|
)
|
||||||
@ -29,10 +30,11 @@ endif()
|
|||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-DCMAKE_DEBUG_POSTFIX=d
|
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
-DBUILD_BENCHMARKS=OFF
|
-DBUILD_BENCHMARKS=OFF
|
||||||
${_CMAKE_EXTRA_OPTIONS}
|
${_CMAKE_EXTRA_OPTIONS}
|
||||||
|
OPTIONS_DEBUG
|
||||||
|
-DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports
|
||||||
)
|
)
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS)
|
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "geos",
|
"name": "geos",
|
||||||
"version": "3.9.1",
|
"version": "3.9.1",
|
||||||
"port-version": 2,
|
"port-version": 3,
|
||||||
"description": "Geometry Engine Open Source",
|
"description": "Geometry Engine Open Source",
|
||||||
"homepage": "https://www.osgeo.org/projects/geos/",
|
"homepage": "https://www.osgeo.org/projects/geos/",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -2354,7 +2354,7 @@
|
|||||||
},
|
},
|
||||||
"geos": {
|
"geos": {
|
||||||
"baseline": "3.9.1",
|
"baseline": "3.9.1",
|
||||||
"port-version": 2
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"geotrans": {
|
"geotrans": {
|
||||||
"baseline": "3.8",
|
"baseline": "3.8",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e",
|
||||||
|
"version": "3.9.1",
|
||||||
|
"port-version": 3
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5",
|
"git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5",
|
||||||
"version": "3.9.1",
|
"version": "3.9.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user