diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c783148..bbe424d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,14 +13,14 @@ repos: # This brings in a portable version of clang-format. # See also: https://github.com/ssciwr/clang-format-wheel - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 + rev: v19.1.4 hooks: - id: clang-format types_or: [c++, c] # CMake linting and formatting - repo: https://github.com/BlankSpruce/gersemi - rev: 0.15.1 + rev: 0.17.1 hooks: - id: gersemi name: CMake linting @@ -28,7 +28,7 @@ repos: # Markdown linting # Config file: .markdownlint.yaml - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.41.0 + rev: v0.43.0 hooks: - id: markdownlint exclude: ^papers/ diff --git a/CMakePresets.json b/CMakePresets.json index 42d3d6c..11abeb1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -158,7 +158,7 @@ { "name": "clang-16", "inherits": "common", - "configurePreset": "clang-16" + "configurePreset": "clang-16", "targets": [ "all_verify_interface_header_sets", "all" diff --git a/etc/clang-flags.cmake b/etc/clang-flags.cmake index 5b23bf7..9613814 100644 --- a/etc/clang-flags.cmake +++ b/etc/clang-flags.cmake @@ -33,12 +33,22 @@ set(CMAKE_CXX_FLAGS_TSAN "C++ TSAN Flags" FORCE ) -set(CMAKE_CXX_FLAGS_ASAN - "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" - CACHE STRING - "C++ ASAN Flags" - FORCE -) +if(APPLE) + set(CMAKE_CXX_FLAGS_ASAN + "-O3 -g -DNDEBUG -fsanitize=address,undefined" + CACHE STRING + "C++ ASAN Flags" + FORCE + ) +else() + set(CMAKE_CXX_FLAGS_ASAN + "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" + CACHE STRING + "C++ ASAN Flags" + FORCE + ) +endif() + set(CMAKE_CXX_FLAGS_GCOV "-O0 -fno-inline -g --coverage" CACHE STRING diff --git a/etc/gcc-flags.cmake b/etc/gcc-flags.cmake index 4747203..6cb2f6e 100644 --- a/etc/gcc-flags.cmake +++ b/etc/gcc-flags.cmake @@ -28,12 +28,21 @@ set(CMAKE_CXX_FLAGS_TSAN "C++ TSAN Flags" FORCE ) -set(CMAKE_CXX_FLAGS_ASAN - "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" - CACHE STRING - "C++ ASAN Flags" - FORCE -) +if(APPLE) + set(CMAKE_CXX_FLAGS_ASAN + "-O3 -g -DNDEBUG -fsanitize=address,undefined" + CACHE STRING + "C++ ASAN Flags" + FORCE + ) +else() + set(CMAKE_CXX_FLAGS_ASAN + "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" + CACHE STRING + "C++ ASAN Flags" + FORCE + ) +endif() set(CMAKE_CXX_FLAGS_GCOV "-O0 -fno-inline -g --coverage -fprofile-abs-path"