Skip to content
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

[vtk] Reduce dependencies by adding new features #39511

Merged
merged 10 commits into from
Jul 18, 2024
+61 −23
Merged

[vtk] Reduce dependencies by adding new features #39511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4435f22
[vtk] qttools is not needed
bansan85 Jun 25, 2024
5d3d7eb
[vtk] freetype in vtk only use zlib
bansan85 Jun 26, 2024
68b2623
[vtk] libxml2 in vtk only use zlib
bansan85 Jun 26, 2024
ad50b03
[vtk] hdf5 needs zlib
bansan85 Jun 28, 2024
b82f131
[seacas] cgns only needs hdf5
bansan85 Jun 28, 2024
54841fd
[vtk] netcdf-c only needs hdf5
bansan85 Jun 28, 2024
9a36664
[seacas] matio is now optional
bansan85 Jun 28, 2024
1044709
[vtk] qt doesn't need qtimageformats
bansan85 Jul 8, 2024
50df840
[vtk] Fix usage
bansan85 Jul 9, 2024
4ef90d3
[seacas] Don't enable Matio by default
bansan85 Jul 16, 2024
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
3 changes: 2 additions & 1 deletion ports/seacas/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
mpi TPL_ENABLE_MPI
matio TPL_ENABLE_Matio
# mpi TPL_ENABLE_Pnetcdf # missing Pnetcdf port
${PARMETIS_FEATURES}
)
Expand All @@ -33,7 +34,7 @@ endif()

set(tpl_disable_list GTest DataWarp Pamgen X11 CUDA Kokkos Faodel Pnetcdf ADIOS2 Catalyst2)

set(tpl_enable_list Zlib HDF5 Netcdf CGNS Matio fmt Cereal)
set(tpl_enable_list Zlib HDF5 Netcdf CGNS fmt Cereal)

if(VCPKG_TARGET_IS_OSX)
list(APPEND tpl_disable_list METIS)
Expand Down
27 changes: 19 additions & 8 deletions ports/seacas/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
{
"name": "seacas",
"version-date": "2022-11-22",
"port-version": 5,
"port-version": 6,
"description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.",
"homepage": "https://github.com/sandialabs/seacas",
"license": null,
"dependencies": [
"cereal",
"cgns",
"fmt",
{
"name": "hdf5",
"default-features": false
},
{
"name": "matio",
"name": "cgns",
"default-features": false,
"features": [
"hdf5"
]
},
"fmt",
{
"name": "hdf5",
"default-features": false
},
"metis",
{
"name": "netcdf-c",
Expand All @@ -39,6 +38,18 @@
"zlib"
],
"features": {
"matio": {
"description": "Enable Matio support",
"dependencies": [
{
"name": "matio",
"default-features": false,
"features": [
"hdf5"
]
}
]
},
"mpi": {
"description": "Enable MPI support",
"dependencies": [
Expand Down
1 change: 0 additions & 1 deletion ports/vtk/usage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
The package vtk provides CMake targets:

find_package(VTK REQUIRED)
include("${VTK_USE_FILE}")
target_link_libraries(main PRIVATE ${VTK_LIBRARIES})
39 changes: 28 additions & 11 deletions ports/vtk/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vtk",
"version-semver": "9.3.0-pv5.12.1",
"port-version": 1,
"port-version": 2,
"description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK",
"license": "BSD-3-Clause",
Expand All @@ -12,11 +12,20 @@
"exprtk",
"fast-float",
"fmt",
"freetype",
{
"name": "freetype",
"default-features": false,
"features": [
"zlib"
]
},
"glew",
{
"name": "hdf5",
"default-features": false
"default-features": false,
"features": [
"zlib"
]
},
"jsoncpp",
{
Expand All @@ -28,9 +37,21 @@
"libogg",
"libpng",
"libtheora",
"libxml2",
{
"name": "libxml2",
"default-features": false,
"features": [
"zlib"
]
},
"lz4",
"netcdf-c",
{
"name": "netcdf-c",
"default-features": false,
"features": [
"hdf5"
]
},
"pegtl",
{
"name": "proj",
Expand Down Expand Up @@ -213,15 +234,11 @@
"features": [
"gui",
"opengl",
"sql-sqlite",
"widgets"
]
},
"qtdeclarative",
"qtimageformats",
{
"name": "qttools",
"default-features": false
}
"qtdeclarative"
]
},
"utf8": {
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8070,7 +8070,7 @@
},
"seacas": {
"baseline": "2022-11-22",
"port-version": 5
"port-version": 6
},
"seal": {
"baseline": "4.1.1",
Expand Down Expand Up @@ -9310,7 +9310,7 @@
},
"vtk": {
"baseline": "9.3.0-pv5.12.1",
"port-version": 1
"port-version": 2
},
"vtk-dicom": {
"baseline": "0.8.14",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/seacas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bebbef6d1a82c6848bbb8d619a5e379f9b29b3f9",
"version-date": "2022-11-22",
"port-version": 6
},
{
"git-tree": "0107d3359b2fa880981554b822946ccb2109baea",
"version-date": "2022-11-22",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vtk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c230cc0e6003a34330671080a7c00f3618c23e4",
"version-semver": "9.3.0-pv5.12.1",
"port-version": 2
},
{
"git-tree": "a29da0e8cb31a173e6d7aacf0f1fdfc0f7178744",
"version-semver": "9.3.0-pv5.12.1",
Expand Down
Loading