diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-30 20:33:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-30 20:33:47 (GMT) |
| commit | a29f9e8451ffa391c8395db1142bd003f40f3aaa (patch) | |
| tree | cbd191c05f7339d1fa502ed8efe880abd772fd1e /config | |
| parent | 1531c49730e33e897cdfbdd0bf88267dd7f7c0f4 (diff) | |
| download | hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.zip hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.tar.gz hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.tar.bz2 | |
Merge changes from develop to fix various issues
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/CTestCustom.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index dfead16..fa4c66e 100644 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -25,12 +25,14 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION # "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type" # "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244" "src.ZLIB.*:[ \t]*warning" + "warning LNK4197:.*ZLIB-prefix" "src.SZIP.*:[ \t]*warning" # "POSIX name for this item is deprecated" "disabling jobserver mode" "config.cmake.xlatefile.c" # "warning.*implicit declaration of function" "warning.*unknown pragma" + "warning.*unrecognized .pragma" # "note: expanded from macro" # "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro" ) @@ -133,7 +135,9 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE H5REPACK-szip_individual-clear-objects H5REPACK-szip_remove-clear-objects H5REPACK-upgrade_layout-clear-objects + H5REPACK_DMP-attrregion-clear-objects H5REPACK_DMP-crtorder-clear-objects + H5REPACK_DMP-dataregion-clear-objects H5REPACK_DMP-deflate_limit-clear-objects H5REPACK-bug1814-clear-objects H5REPACK-HDFFV-5932-clear-objects |