diff --git a/ports/netcdf-c/fix-dependency-mpi.patch b/ports/netcdf-c/fix-dependency-mpi.patch new file mode 100644 index 00000000000..91eb2434b12 --- /dev/null +++ b/ports/netcdf-c/fix-dependency-mpi.patch @@ -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 "") diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 62f580e6f28..441d422cc61 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -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 diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 80fbcdd10e7..77df76e4d85 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index c645631d339..88683e0f958 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4698,7 +4698,7 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 1 + "port-version": 2 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 61db416a003..af3e5e2b495 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5", + "version": "4.8.1", + "port-version": 2 + }, { "git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a", "version": "4.8.1",