aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-02-28 02:30:36 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-02-28 02:30:36 -0800
commite1e0b7a6a9a0dac912b7857dea879a69bb782911 (patch)
treeae93b86da2191584123e3495bd31064e203888ca
parent3cc5cb8bca033f980fa22f8792a12abc4e962df9 (diff)
downloadvcpkg-e1e0b7a6a9a0dac912b7857dea879a69bb782911.tar.gz
vcpkg-e1e0b7a6a9a0dac912b7857dea879a69bb782911.zip
[netcdf-c] Add transitive cmake dependency on hdf5
-rw-r--r--ports/netcdf-c/CONTROL2
-rw-r--r--ports/netcdf-c/portfile.cmake1
-rw-r--r--ports/netcdf-c/transitive-hdf5.patch13
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 4a9be9132..1303cb517 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,4 +1,4 @@
Source: netcdf-c
-Version: 4.4.1.1
+Version: 4.4.1.1-1
Build-Depends: hdf5, curl
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/portfile.cmake b/ports/netcdf-c/portfile.cmake
index 5b798f266..75a361106 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_apply_patches(
PATCHES
${CMAKE_CURRENT_LIST_DIR}/no-install-deps.patch
${CMAKE_CURRENT_LIST_DIR}/config-pkg-location.patch
+ ${CMAKE_CURRENT_LIST_DIR}/transitive-hdf5.patch
)
vcpkg_configure_cmake(
diff --git a/ports/netcdf-c/transitive-hdf5.patch b/ports/netcdf-c/transitive-hdf5.patch
new file mode 100644
index 000000000..220640366
--- /dev/null
+++ b/ports/netcdf-c/transitive-hdf5.patch
@@ -0,0 +1,13 @@
+diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
+index 6f4ccf8..14a3743 100644
+--- a/netCDFConfig.cmake.in
++++ b/netCDFConfig.cmake.in
+@@ -11,6 +11,8 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+
+ set(netCDF_LIBRARIES netcdf)
+
++find_package(HDF5 REQUIRED)
++
+ # include target information
+ include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
+