[vtk] Fix proj, trim feature dependencies (#29703)

This commit is contained in:
Kai Pastor 2023-03-13 20:07:07 +01:00 committed by GitHub
parent ac4f80ae9d
commit f09a222686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions

View File

@ -1,7 +1,14 @@
diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake
index e2344bb17..bac4c747e 100644 index 6f607d4..86c85a9 100644
--- a/CMake/FindLibPROJ.cmake --- a/CMake/FindLibPROJ.cmake
+++ b/CMake/FindLibPROJ.cmake +++ b/CMake/FindLibPROJ.cmake
@@ -1,5 +1,5 @@
find_path(LibPROJ_INCLUDE_DIR
- NAMES proj_api.h proj.h
+ NAMES proj.h
DOC "libproj include directories")
mark_as_advanced(LibPROJ_INCLUDE_DIR)
@@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE @@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE
mark_as_advanced(LibPROJ_LIBRARY_RELEASE) mark_as_advanced(LibPROJ_LIBRARY_RELEASE)

View File

@ -1,7 +1,7 @@
{ {
"name": "vtk", "name": "vtk",
"version-semver": "9.2.0-pv5.11.0", "version-semver": "9.2.0-pv5.11.0",
"port-version": 4, "port-version": 5,
"description": "Software system for 3D computer graphics, image processing, and visualization", "description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK", "homepage": "https://github.com/Kitware/VTK",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
@ -31,7 +31,10 @@
"lz4", "lz4",
"netcdf-c", "netcdf-c",
"pegtl", "pegtl",
"proj", {
"name": "proj",
"default-features": false
},
"pugixml", "pugixml",
{ {
"name": "seacas", "name": "seacas",
@ -101,13 +104,9 @@
"gdal": { "gdal": {
"description": "Support GDAL compilation", "description": "Support GDAL compilation",
"dependencies": [ "dependencies": [
"gdal",
{ {
"name": "vtk", "name": "gdal",
"default-features": false, "default-features": false
"features": [
"mpi"
]
} }
] ]
}, },

View File

@ -8238,7 +8238,7 @@
}, },
"vtk": { "vtk": {
"baseline": "9.2.0-pv5.11.0", "baseline": "9.2.0-pv5.11.0",
"port-version": 4 "port-version": 5
}, },
"vtk-dicom": { "vtk-dicom": {
"baseline": "0.8.14", "baseline": "0.8.14",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d58e0bca42952f053f26534bad7771a29a1e16c8",
"version-semver": "9.2.0-pv5.11.0",
"port-version": 5
},
{ {
"git-tree": "1261828e6817fb1dcc11cbb50a257104e87c1e69", "git-tree": "1261828e6817fb1dcc11cbb50a257104e87c1e69",
"version-semver": "9.2.0-pv5.11.0", "version-semver": "9.2.0-pv5.11.0",