diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-24 20:02:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 20:02:33 (GMT) |
| commit | 108c7397372751efe5f953c854673cbcfc7356ca (patch) | |
| tree | b826ec01ec8dba1e2889021675d11631d8c84b4d /config/sanitizer/sanitizers.cmake | |
| parent | 9e93204a23346a5b7cf5b8673cf50e6ac2497021 (diff) | |
| download | hdf5-108c7397372751efe5f953c854673cbcfc7356ca.zip hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.gz hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.bz2 | |
1.8 Merge config changes from dev (#1032)
* Merge config changes from dev
* Revert added git file changes
* Merge MS clang needs EHsc flag #1035
Diffstat (limited to 'config/sanitizer/sanitizers.cmake')
| -rw-r--r-- | config/sanitizer/sanitizers.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake index 0803279..8bf1d5b 100644 --- a/config/sanitizer/sanitizers.cmake +++ b/config/sanitizer/sanitizers.cmake @@ -30,13 +30,13 @@ endfunction() message(STATUS "USE_SANITIZER=${USE_SANITIZER}, CMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}") if(USE_SANITIZER) - if(INTEL_CLANG OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") + if(INTEL_CLANG OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - append("-fno-omit-frame-pointer" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS) - message(STATUS "Building with sanitize, base flags=${CMAKE_C_SANITIZER_FLAGS}") - if(UNIX) + append("-fno-omit-frame-pointer" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS) + message(STATUS "Building with sanitize, base flags=${CMAKE_C_SANITIZER_FLAGS}") + if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG") append("-O1" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS) endif() @@ -83,7 +83,7 @@ if(USE_SANITIZER) elseif(MSVC) if(USE_SANITIZER MATCHES "([Aa]ddress)") message(STATUS "Building with Address sanitizer") - append("-fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS) + append("/fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS) else() message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${USE_SANITIZER}") endif() |