From 6ed8f34373a3476fdb7d263be6909c2a56a0c0b0 Mon Sep 17 00:00:00 2001 From: Christopher Whelan Date: Fri, 2 Jun 2017 11:19:57 -0700 Subject: [PATCH 1/2] Upgrade to hdf5 1.8.18 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 38c276d9..db15a01b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - dap.path # [win] build: - number: 4 + number: 5 features: - vc9 # [win and py27] - vc10 # [win and py34] @@ -30,7 +30,7 @@ requirements: - curl - zlib 1.2.* - hdf4 - - hdf5 1.8.17|1.8.17.* + - hdf5 1.8.18|1.8.18.* - vc 9 # [win and py27] - vc 10 # [win and py34] - vc 14 # [win and py35] @@ -38,7 +38,7 @@ requirements: - curl - zlib 1.2.* - hdf4 - - hdf5 1.8.17|1.8.17.* + - hdf5 1.8.18|1.8.18.* - vc 9 # [win and py27] - vc 10 # [win and py34] - vc 14 # [win and py35] From 045740b77a23683badc1694fa3716fb0da7d7dc6 Mon Sep 17 00:00:00 2001 From: Christopher Whelan Date: Mon, 5 Jun 2017 20:04:50 -0700 Subject: [PATCH 2/2] Patch CMakeLists to import Threads --- recipe/CMakeLists.patch | 11 +++++++++++ recipe/meta.yaml | 1 + 2 files changed, 12 insertions(+) create mode 100644 recipe/CMakeLists.patch diff --git a/recipe/CMakeLists.patch b/recipe/CMakeLists.patch new file mode 100644 index 00000000..e9a21477 --- /dev/null +++ b/recipe/CMakeLists.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2016-11-21 10:27:08.000000000 -0800 ++++ CMakeLists.txt 2017-06-05 19:36:55.837393000 -0700 +@@ -637,6 +637,8 @@ + ENDIF(MSVC) + ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) + ++ find_package(Threads REQUIRED) ++ + ### + # The following options are not used in Windows. + ### diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db15a01b..d9bb3d35 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: - dim.c.patch # [win] - semantics.c.patch # [win] - dap.path # [win] + - CMakeLists.patch # [win] build: number: 5