Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to hdf5 1.8.18 #21

Merged
merged 2 commits into from
Jun 6, 2017
Merged

Upgrade to hdf5 1.8.18 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed8f34
Upgrade to hdf5 1.8.18
qwhelan Jun 2, 2017
045740b
Patch CMakeLists to import Threads
qwhelan Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions recipe/CMakeLists.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
###
7 changes: 4 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ source:
- dim.c.patch # [win]
- semantics.c.patch # [win]
- dap.path # [win]
- CMakeLists.patch # [win]

build:
number: 4
number: 5
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
Expand All @@ -30,15 +31,15 @@ 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]
run:
- 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]
Expand Down