diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-01-27 21:04:35 +0100 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-27 12:04:35 -0800 |
| commit | d19c61353d65220b9beaa7a5dfbc39967fb839e3 (patch) | |
| tree | b4a987b9296d8729b6346e00891d6d64cabdd004 | |
| parent | f787fa41130dd37092fda2dedbb6430489cd91ca (diff) | |
| download | vcpkg-d19c61353d65220b9beaa7a5dfbc39967fb839e3.tar.gz vcpkg-d19c61353d65220b9beaa7a5dfbc39967fb839e3.zip | |
[netcdf-c] Fix builds with hdf5[parallel] (#9721)
* [netcdf-c] Fix builds with hdf5[parallel]
* Update mpi.patch
| -rw-r--r-- | ports/netcdf-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/netcdf-c/mpi.patch | 14 | ||||
| -rw-r--r-- | ports/netcdf-c/portfile.cmake | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index 1d5b7cb90..d277cd975 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,5 +1,5 @@ Source: netcdf-c -Version: 4.7.3 +Version: 4.7.3-1 Build-Depends: hdf5, curl Homepage: https://github.com/Unidata/netcdf-c Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/mpi.patch b/ports/netcdf-c/mpi.patch new file mode 100644 index 000000000..64027e65c --- /dev/null +++ b/ports/netcdf-c/mpi.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 101f97719..b070121b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1004,6 +1004,8 @@ IF(ENABLE_PARALLEL4 AND ENABLE_NETCDF_4)
+ IF(MSVC)
+ FIND_PACKAGE(MPI REQUIRED)
+ INCLUDE_DIRECTORIES(${MPI_C_INCLUDE_PATH})
++ list(APPEND CMAKE_REQUIRED_LIBRARIES MPI::MPI_C)
++ list(APPEND EXTRA_DEPS MPI::MPI_C)
+ ENDIF()
+ 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 61dd1d885..d1af9d9f1 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( no-install-deps.patch config-pkg-location.patch use_targets.patch + mpi.patch ) #Remove outdated find modules |