summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-08-08 17:03:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-08-08 17:03:44 (GMT)
commit79b2eb993e29cf0382db07b322fa3ca5cb00fc65 (patch)
tree68bbfe3ad865e8b236b08e7aa5e30b586052b002
parent9c547117ece94acacbbdd804166f32b6208596da (diff)
downloadhdf5-79b2eb993e29cf0382db07b322fa3ca5cb00fc65.zip
hdf5-79b2eb993e29cf0382db07b322fa3ca5cb00fc65.tar.gz
hdf5-79b2eb993e29cf0382db07b322fa3ca5cb00fc65.tar.bz2
[svn-r22642] Correct check for filters in tools test
-rw-r--r--tools/h5dump/CMakeLists.txt33
-rw-r--r--tools/h5import/CMakeLists.txt4
2 files changed, 29 insertions, 8 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 02327b4..7d76d07 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -782,14 +782,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)
##############################################################################
##############################################################################
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index a655bf2..4e320a1 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -273,7 +273,9 @@ IF (BUILD_TESTING)
# --------------------------------------------------------------------
# Determine if filter is available for h5diff
# --------------------------------------------------------------------
- SET (USE_FILTER_DEFLATE H5_HAVE_FILTER_DEFLATE)
+ IF (H5_HAVE_FILTER_DEFLATE)
+ SET (USE_FILTER_DEFLATE "true")
+ ENDIF (H5_HAVE_FILTER_DEFLATE)
##############################################################################
##############################################################################