diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-12 02:20:43 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-12 02:20:43 (GMT) |
| commit | cd5ad177a23698c1daf6fb8c4195336865d795d2 (patch) | |
| tree | 13720372b8dcf964d99cbec2d7ff5de1bdbdd565 /tools/h5dump | |
| parent | cd3f42096b9a957e37c9df48aa0d31d9ed4bc537 (diff) | |
| download | hdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.zip hdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.tar.gz hdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.tar.bz2 | |
[svn-r22669] Description:
Merge r22634:2266 from trunk to revise_chunks branch
Tested on:
Mac OSX/64 10.7.4 (amazon) w/debug, gcc-4.7.x, C++, FORTRAN and threadsafe
(h5committest not needed on this branch)
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index cf442d4..1482327 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -781,14 +781,33 @@ IF (BUILD_TESTING) ENDMACRO (ADD_XML_H5_TEST file) # -------------------------------------------------------------------- - # Determine which filters are available + # See which filters are usable (and skip tests for filters we + # don't have). Do this by searching H5pubconf.h to see which + # filters are defined. # -------------------------------------------------------------------- - SET (USE_FILTER_SZIP H5_HAVE_FILTER_SZIP) - SET (USE_FILTER_DEFLATE H5_HAVE_FILTER_DEFLATE) - SET (USE_FILTER_SHUFFLE H5_HAVE_FILTER_SHUFFLE) - SET (USE_FILTER_FLETCHER32 H5_HAVE_FILTER_FLETCHER32) - SET (USE_FILTER_NBIT H5_HAVE_FILTER_NBIT) - SET (USE_FILTER_SCALEOFFSET H5_HAVE_FILTER_SCALEOFFSET) + IF (H5_HAVE_FILTER_DEFLATE) + SET (USE_FILTER_DEFLATE "true") + ENDIF (H5_HAVE_FILTER_DEFLATE) + + IF (H5_HAVE_FILTER_SZIP) + SET (USE_FILTER_SZIP "true") + ENDIF (H5_HAVE_FILTER_SZIP) + + IF (H5_HAVE_FILTER_SHUFFLE) + SET (USE_FILTER_SHUFFLE "true") + ENDIF (H5_HAVE_FILTER_SHUFFLE) + + IF (H5_HAVE_FILTER_FLETCHER32) + SET (USE_FILTER_FLETCHER32 "true") + ENDIF (H5_HAVE_FILTER_FLETCHER32) + + IF (H5_HAVE_FILTER_NBIT) + SET (USE_FILTER_NBIT "true") + ENDIF (H5_HAVE_FILTER_NBIT) + + IF (H5_HAVE_FILTER_SCALEOFFSET) + SET (USE_FILTER_SCALEOFFSET "true") + ENDIF (H5_HAVE_FILTER_SCALEOFFSET) ############################################################################## ############################################################################## |