Skip to content

Commit

Permalink
Merge pull request #70 from steve-downey/normalize
Browse files Browse the repository at this point in the history
R7 and 8 of the paper and fixes to optional after wording and LEWG reviews.
  • Loading branch information
steve-downey authored Nov 4, 2024
2 parents 1c4803f + 1383086 commit 167b51c
Show file tree
Hide file tree
Showing 25 changed files with 5,237 additions and 1,648 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: CI Tests
on:
workflow_dispatch:
push:
branches: [main]
pull_request:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: pre-commit

on:
workflow_dispatch:
pull_request:
push:
branches: [main]
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ $(_build_path)/CMakeCache.txt: | $(_build_path) .gitmodules
-rm compile_commands.json
ln -s $(_build_path)/compile_commands.json

TARGET:=all
compile: $(_build_path)/CMakeCache.txt ## Compile the project
cmake --build $(_build_path) --config $(CONFIG) --target all -- -k 0

Expand Down Expand Up @@ -91,6 +92,9 @@ env:
papers:
$(MAKE) -C papers/P2988 papers

.DEFAULT: $(_build_path)/CMakeCache.txt ## Other targets passed through to cmake
cmake --build $(_build_path) --config $(CONFIG) --target $@ -- -k 0

PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10 || which python3.9 || which python3.8 || which python3.7 || which python3)
PYTHON ?= $(shell basename $(PYEXECPATH))
VENV := .venv
Expand Down Expand Up @@ -167,4 +171,4 @@ coverage: venv
# Help target
.PHONY: help
help: ## Show this help.
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
@awk 'BEGIN {FS = ":.*?## "} /^[.a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
6 changes: 6 additions & 0 deletions etc/clang-20-toolchain.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include_guard(GLOBAL)

set(CMAKE_C_COMPILER clang-20)
set(CMAKE_CXX_COMPILER clang++-20)

include("${CMAKE_CURRENT_LIST_DIR}/clang-flags.cmake")
7 changes: 7 additions & 0 deletions etc/gcc-14-toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")
set(CMAKE_C_COMPILER gcc-14)
set(CMAKE_CXX_COMPILER g++-14)
set(GCOV_EXECUTABLE "gcov-14" CACHE STRING "GCOV executable" FORCE)

set(CMAKE_CXX_FLAGS_ASAN
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
CACHE STRING
"C++ ASAN Flags"
FORCE
)
7 changes: 7 additions & 0 deletions etc/gcc-15-toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")

set(CMAKE_C_COMPILER gcc-15)
set(CMAKE_CXX_COMPILER g++-15)

set(CMAKE_CXX_FLAGS_ASAN
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
CACHE STRING
"C++ ASAN Flags"
FORCE
)
2 changes: 1 addition & 1 deletion etc/gcc-flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(CMAKE_CXX_FLAGS_TSAN
FORCE
)
set(CMAKE_CXX_FLAGS_ASAN
"-O3 -g -DNDEBUG -fsanitize=undefined"
"-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
CACHE STRING
"C++ ASAN Flags"
FORCE
Expand Down
Loading

0 comments on commit 167b51c

Please sign in to comment.