Skip to content

[vtk] Add option ENABLE_HDF5_PARALLEL to fit hdf5 feature parallel #24740

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

Closed
Jack·Boos·Yu (JackBoosY) wants to merge 10 commits into from
Closed

[vtk] Add option ENABLE_HDF5_PARALLEL to fit hdf5 feature parallel #24740

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9628c0
[vtk] Add option ENABLE_HDF5_PARALLEL to fit hdf5 feature parallel
May 17, 2022
d502c75
version
May 17, 2022
ba76ee4
[vtk] add error message instead of patching the source
May 30, 2022
cb94286
Add test port vcpkg-ci-vtk
May 30, 2022
29a0b6a
version
May 30, 2022
3bea547
fix json
May 30, 2022
7131c41
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Jun 6, 2022
4a35b81
Add license
Jun 6, 2022
72de147
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Jul 8, 2022
f4a6a95
Fix mpi4py, pdal and hdf5, add features, disable more components
Jul 8, 2022
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
10 changes: 10 additions & 0 deletions ports/vtk/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ vcpkg_from_github(
file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c
# =============================================================================

# To use hdf5[parallel] in vtk requires feature mpi, see https://gitlab.kitware.com/vtk/vtk/-/issues/18552
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/hdf5/hdf5-config.cmake" AND NOT "mpi" IN_LIST FEATURES)
file(READ "${CURRENT_INSTALLED_DIR}/share/hdf5/hdf5-config.cmake" HDF5_CONFIG)
if ("${HDF5_CONFIG}" MATCHES "ENABLE_PARALLEL ON")
message(FATAL_ERROR "hdf5[parallel] requires feature 'mpi'")
endif()
endif()

# =============================================================================
# Options:
# Collect CMake options for optional components
Expand Down Expand Up @@ -168,6 +176,8 @@ vcpkg_cmake_configure(
${ADDITIONAL_OPTIONS}
-DVTK_DEBUG_MODULE_ALL=ON
-DVTK_DEBUG_MODULE=ON
MAYBE_UNUSED_VARIABLES
VTK_MODULE_ENABLE_VTK_PythonContext2D
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion 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.0.3-pv5.9.1",
"port-version": 10,
"port-version": 11,
"description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK",
"license": "BSD-3-Clause",
Expand Down
1 change: 1 addition & 0 deletions scripts/test_ports/vcpkg-ci-vtk/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
33 changes: 33 additions & 0 deletions scripts/test_ports/vcpkg-ci-vtk/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name": "vcpkg-ci-vtk",
"version-date": "2022-05-30",
"description": "Port to force features of certain ports within CI",
"homepage": "https://github.com/microsoft/vcpkg",
"dependencies": [
{
"name": "vtk",
"default-features": false,
"features": [
"cuda",
"gdal",
"geojson",
"mpi",
"opengl",
"openvr",
"paraview",
"python",
"qt",
"utf8",
"vtkm"
]
},
{
"name": "vtk",
"default-features": false,
"features": [
"atlmfc"
],
"platform": "windows"
}
]
}
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 @@ -7438,7 +7438,7 @@
},
"vtk": {
"baseline": "9.0.3-pv5.9.1",
"port-version": 10
"port-version": 11
},
"vtk-dicom": {
"baseline": "0.8.12",
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": "a4b3a0e5be24cb0c2ac714595e5d47e47f4e0139",
"version-semver": "9.0.3-pv5.9.1",
"port-version": 11
},
{
"git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27",
"version-semver": "9.0.3-pv5.9.1",
Expand Down