diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index a2b622aa4309c7..dd78fb15714326 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -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} ) @@ -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) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index d18427453539ad..3f4792cfefb255 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -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", @@ -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": [ diff --git a/ports/vtk/usage b/ports/vtk/usage index bba2f639079441..3324011b508ef3 100644 --- a/ports/vtk/usage +++ b/ports/vtk/usage @@ -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}) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 4ee9ebafca68d4..be2df6c6ffcb4f 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -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", @@ -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", { @@ -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", @@ -213,15 +234,11 @@ "features": [ "gui", "opengl", + "sql-sqlite", "widgets" ] }, - "qtdeclarative", - "qtimageformats", - { - "name": "qttools", - "default-features": false - } + "qtdeclarative" ] }, "utf8": { diff --git a/versions/baseline.json b/versions/baseline.json index 13dbe8ce87ac51..f5a8f120872afb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8070,7 +8070,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 5 + "port-version": 6 }, "seal": { "baseline": "4.1.1", @@ -9310,7 +9310,7 @@ }, "vtk": { "baseline": "9.3.0-pv5.12.1", - "port-version": 1 + "port-version": 2 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index faa6b3c98d9f54..a0a68f42b94088 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bebbef6d1a82c6848bbb8d619a5e379f9b29b3f9", + "version-date": "2022-11-22", + "port-version": 6 + }, { "git-tree": "0107d3359b2fa880981554b822946ccb2109baea", "version-date": "2022-11-22", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index aab22fc0174b9b..911db0e2b2801f 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -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",