mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 22:58:00 +08:00
[netcdf-c] fix installation on windows when hdf5[parallel] is installed (#22488)
fixes #21646
This commit is contained in:
parent
95c1b6fe50
commit
e9734e1805
11
ports/netcdf-c/fix-dependency-mpi.patch
Normal file
11
ports/netcdf-c/fix-dependency-mpi.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1207,7 +1207,8 @@
|
||||
IF(NOT HDF5_PARALLEL)
|
||||
SET(USE_PARALLEL OFF CACHE BOOL "")
|
||||
MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.")
|
||||
ELSE()
|
||||
FIND_PACKAGE(MPI REQUIRED)
|
||||
+ list(REMOVE_ITEM MPI_C_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
SET(HDF5_PARALLEL ON CACHE BOOL "")
|
||||
SET(USE_PARALLEL ON CACHE BOOL "")
|
@ -13,6 +13,7 @@ vcpkg_from_github(
|
||||
fix-pkgconfig.patch
|
||||
fix-manpage-msys.patch
|
||||
fix-dependency-libzip.patch
|
||||
fix-dependency-mpi.patch
|
||||
)
|
||||
|
||||
#Remove outdated find modules
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "netcdf-c",
|
||||
"version": "4.8.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.",
|
||||
"homepage": "https://github.com/Unidata/netcdf-c",
|
||||
"dependencies": [
|
||||
|
@ -4698,7 +4698,7 @@
|
||||
},
|
||||
"netcdf-c": {
|
||||
"baseline": "4.8.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"netcdf-cxx4": {
|
||||
"baseline": "4.3.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5",
|
||||
"version": "4.8.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a",
|
||||
"version": "4.8.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user