diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-28 19:59:48 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-28 19:59:48 (GMT) |
| commit | c627ab6a8a2067822789b69071d95b89363a052c (patch) | |
| tree | 5db7eba34801079669abf4a20f221a37d4836bff | |
| parent | 607dbc14350df256866fa326de23877e08353f78 (diff) | |
| parent | f4dce7dfb3bb8cc217b4935d92ecd098748d6ea0 (diff) | |
| download | hdf5-c627ab6a8a2067822789b69071d95b89363a052c.zip hdf5-c627ab6a8a2067822789b69071d95b89363a052c.tar.gz hdf5-c627ab6a8a2067822789b69071d95b89363a052c.tar.bz2 | |
Merge pull request #2314 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_12 to hdf5_1_12
* commit 'f4dce7dfb3bb8cc217b4935d92ecd098748d6ea0':
Correct ignore warnings and use only clang for sanitizers
| -rw-r--r-- | config/cmake/CTestCustom.cmake | 26 | ||||
| -rw-r--r-- | config/sanitizer/sanitizers.cmake | 2 |
2 files changed, 5 insertions, 23 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index 7ee5737..dfead16 100644 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -21,14 +21,16 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION # "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:" # "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument" # "H5detect.c[0-9 \t:]*warning:[ \t]*passing argument" -# "note.*expected.*void.*but argument is of type.*volatile" + "note.*expected.*void.*but argument is of type.*volatile" # "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" -# "SZIP.src.*:[ \t]*warning" + "src.ZLIB.*:[ \t]*warning" + "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" # "note: expanded from macro" # "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro" ) @@ -69,26 +71,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE HL_FORTRAN_f90_ex-clear-objects ######### tools/h5clear ######### H5CLEAR-clearall-objects - H5CLEAR-copy_h5clear_fsm_persist_equal.h5 - H5CLEAR-copy_h5clear_fsm_persist_greater.h5 - H5CLEAR-copy_h5clear_fsm_persist_less.h5 - H5CLEAR-copy_h5clear_fsm_persist_noclose.h5 - H5CLEAR-copy_h5clear_fsm_persist_user_equal.h5 - H5CLEAR-copy_h5clear_fsm_persist_user_greater.h5 - H5CLEAR-copy_h5clear_fsm_persist_user_less.h5 - H5CLEAR-copy_h5clear_log_v3.h5 - H5CLEAR-copy_h5clear_mdc_image.h5 - H5CLEAR-copy_h5clear_sec2_v0.h5 - H5CLEAR-copy_h5clear_sec2_v2.h5 - H5CLEAR-copy_h5clear_sec2_v3.h5 - H5CLEAR-copy_h5clear_status_noclear.h5 - H5CLEAR-copy_latest_h5clear_log_v3.h5 - H5CLEAR-copy_latest_h5clear_sec2_v3.h5 - H5CLEAR-copy_mod_h5clear_mdc_image.h5 - H5CLEAR-copy_mod_h5clr_mdc_image2.h5 - H5CLEAR-copy_orig_h5clear_sec2_v0.h5 - H5CLEAR-copy_orig_h5clear_sec2_v2.h5 - H5CLEAR-copy_orig_h5clear_sec2_v3.h5 H5CLEAR-h5clear_gentest # does not close ids by design ######### tools/h5copy ######### H5COPY-clearall-objects diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake index 7a6c195..2625ec3 100644 --- a/config/sanitizer/sanitizers.cmake +++ b/config/sanitizer/sanitizers.cmake @@ -28,7 +28,7 @@ function(append value) endforeach(variable) endfunction() -if(USE_SANITIZER) +if(USE_SANITIZER AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) append("-fno-omit-frame-pointer" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) |