[hdf5] Ensure mpi usage in downstream ports (#29724)

* [hdf5] Force parallel usage on downstream ports

* Move effects downstream
This commit is contained in:
Kai Pastor 2023-04-04 21:10:32 +02:00 committed by GitHub
parent 470a5f6ecf
commit 6ba86f3584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 39 additions and 8 deletions

View File

@ -161,6 +161,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
if("parallel" IN_LIST FEATURES)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
endif()
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

View File

@ -0,0 +1,4 @@
# This variable can be used for testing and for messages.
set(HDF5_WITH_PARALLEL [[
HDF5 was built with parallel support.
]])

View File

@ -1,6 +1,7 @@
{
"name": "hdf5",
"version": "1.14.0",
"port-version": 1,
"description": "HDF5 is a data model, library, and file format for storing and managing data",
"homepage": "https://www.hdfgroup.org/downloads/hdf5/",
"license": "BSD-3-Clause",

View File

@ -11,15 +11,18 @@ vcpkg_from_github(
fix-headers.patch
)
if(NOT VCPKG_TARGET_IS_OSX)
set(MPI_FEATURES mpi TPL_ENABLE_ParMETIS)
if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES)
message(WARNING "${HDF5_WITH_PARALLEL} Enabling MPI in seacas.")
list(APPEND FEATURES "mpi")
elseif(NOT VCPKG_TARGET_IS_OSX)
set(PARMETIS_FEATURES mpi TPL_ENABLE_ParMETIS)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
mpi TPL_ENABLE_MPI
# mpi TPL_ENABLE_Pnetcdf # missing Pnetcdf port
${MPI_FEATURES}
${PARMETIS_FEATURES}
)
if(VCPKG_TARGET_IS_WINDOWS)

View File

@ -1,7 +1,7 @@
{
"name": "seacas",
"version-date": "2022-11-22",
"port-version": 2,
"port-version": 3,
"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,

View File

@ -47,6 +47,11 @@ vcpkg_from_github(
file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c
# =============================================================================
if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES)
message(WARNING "${HDF5_WITH_PARALLEL} Enabling MPI in vtk.")
list(APPEND FEATURES "mpi")
endif()
# =============================================================================
# Options:
# Collect CMake options for optional components

View File

@ -1,7 +1,7 @@
{
"name": "vtk",
"version-semver": "9.2.0-pv5.11.0",
"port-version": 5,
"port-version": 6,
"description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK",
"license": "BSD-3-Clause",

View File

@ -3038,7 +3038,7 @@
},
"hdf5": {
"baseline": "1.14.0",
"port-version": 0
"port-version": 1
},
"healpix": {
"baseline": "1.12.10",
@ -7194,7 +7194,7 @@
},
"seacas": {
"baseline": "2022-11-22",
"port-version": 2
"port-version": 3
},
"seal": {
"baseline": "4.1.1",
@ -8294,7 +8294,7 @@
},
"vtk": {
"baseline": "9.2.0-pv5.11.0",
"port-version": 5
"port-version": 6
},
"vtk-dicom": {
"baseline": "0.8.14",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1266e52ebeeb58e015af053d4e87e5356efe130e",
"version": "1.14.0",
"port-version": 1
},
{
"git-tree": "a4600f49dc4a0f8d522a408fb5486b77ce6ae7ed",
"version": "1.14.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f49bca0bdf21c4b79c80ecefe3d3aa9a75ba49e7",
"version-date": "2022-11-22",
"port-version": 3
},
{
"git-tree": "00566c22630c8b3dff31a47c3be03389e4d33b3d",
"version-date": "2022-11-22",

View File

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