summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-10-26 20:33:43 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-10-26 20:33:43 (GMT)
commitd3958ee85c8cb16d484f5753993f1a9e17d3f720 (patch)
tree44b3e3525284aa2d7b543ebe95d10f01f14587d5 /config
parentcf7f386fd42ad520f6d2f3fc1ad1706bba791ae0 (diff)
downloadhdf5-d3958ee85c8cb16d484f5753993f1a9e17d3f720.zip
hdf5-d3958ee85c8cb16d484f5753993f1a9e17d3f720.tar.gz
hdf5-d3958ee85c8cb16d484f5753993f1a9e17d3f720.tar.bz2
[svn-r19669] Description:
Bring r19658:19668 from trunk to revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) w/debug Linux/32 2.6 (jam) w/debug (h5committest not required on this branch)
Diffstat (limited to 'config')
-rwxr-xr-xconfig/cmake/CTestCustom.cmake6
-rw-r--r--config/lt_vers.am2
2 files changed, 5 insertions, 3 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index e0a3f3f..6e35860 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -2,8 +2,10 @@ SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500)
SET (CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
- "H5detect.c.[0-9]+.[ ]*: warning C4090:"
- "testhdf5.h.[0-9]+.[ ]*: warning C4005:"
+ "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090"
+ "testhdf5.h.[0-9]+.[ \t]*:[ \t]*warning C4005"
+ "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
+ "SZIP.src.[0-9a-zA-Z]*warning"
"POSIX name for this item is deprecated"
"disabling jobserver mode"
)
diff --git a/config/lt_vers.am b/config/lt_vers.am
index b28eed0..27cd4dd 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 67
+LT_VERS_REVISION = 68
LT_VERS_AGE = 0
## If the API changes *at all*, increment LT_VERS_INTERFACE and