Skip to content

Commit

Permalink
[netcdf-c] fix installation on windows when hdf5[parallel] is install…
Browse files Browse the repository at this point in the history
  • Loading branch information
strega-nil authored and rhuijben committed Jan 25, 2022
1 parent 19b4413 commit 15aca30
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
11 changes: 11 additions & 0 deletions ports/netcdf-c/fix-dependency-mpi.patch
Original file line number Diff line number Diff line change
@@ -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 "")
1 change: 1 addition & 0 deletions ports/netcdf-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/netcdf-c/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4698,7 +4698,7 @@
},
"netcdf-c": {
"baseline": "4.8.1",
"port-version": 1
"port-version": 2
},
"netcdf-cxx4": {
"baseline": "4.3.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/netcdf-c.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5",
"version": "4.8.1",
"port-version": 2
},
{
"git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a",
"version": "4.8.1",
Expand Down

0 comments on commit 15aca30

Please sign in to comment.