Skip to content

Commit

Permalink
Fix builds on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausKlein committed Dec 7, 2024
1 parent 5cffcdb commit 20f6d71
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ 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

# 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/
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
{
"name": "clang-16",
"inherits": "common",
"configurePreset": "clang-16"
"configurePreset": "clang-16",
"targets": [
"all_verify_interface_header_sets",
"all"
Expand Down
22 changes: 16 additions & 6 deletions etc/clang-flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 15 additions & 6 deletions etc/gcc-flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 20f6d71

Please sign in to comment.