Skip to content

Commit 0f7896d

Browse files
committed
Exclude //extern from generation of compilation database
1 parent 45ebb74 commit 0f7896d

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

build/nix/Makefile

+9-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $(eval $(call ADD_TARGET, catch2, extern/catchorg, LIB))
1515
$(eval $(call ADD_TARGET, libfly_unit_tests, test, TEST, catch2 libfly))
1616
$(eval $(call ADD_TARGET, libfly_benchmarks, bench, BIN, catch2 libfly))
1717

18-
# Paths to ignore during code coverage reporting.
18+
# Paths to exclude from code coverage reporting.
1919
#
2020
# 1. Ignore test files.
2121
# 2. Ignore benchmarking files.
@@ -24,11 +24,14 @@ $(eval $(call ADD_TARGET, libfly_benchmarks, bench, BIN, catch2 libfly))
2424
# runtime, which llvm-cov doesn't seem to recognize.
2525
# 5. Ignore literal_parser.hpp - this file is entirely constexpr functions that do not execute at
2626
# runtime, which llvm-cov doesn't seem to recognize.
27-
$(eval $(call IGNORE_FOR_COVERAGE, test/))
28-
$(eval $(call IGNORE_FOR_COVERAGE, bench/))
29-
$(eval $(call IGNORE_FOR_COVERAGE, extern/))
30-
$(eval $(call IGNORE_FOR_COVERAGE, fly/system/nix/system_impl.hpp))
31-
$(eval $(call IGNORE_FOR_COVERAGE, fly/types/numeric/detail/literal_parser.hpp))
27+
$(eval $(call EXCLUDE_FROM_COVERAGE, test/))
28+
$(eval $(call EXCLUDE_FROM_COVERAGE, bench/))
29+
$(eval $(call EXCLUDE_FROM_COVERAGE, extern/))
30+
$(eval $(call EXCLUDE_FROM_COVERAGE, fly/system/nix/system_impl.hpp))
31+
$(eval $(call EXCLUDE_FROM_COVERAGE, fly/types/numeric/detail/literal_parser.hpp))
32+
33+
# Paths to exclude from generation of compilation database.
34+
$(eval $(call EXCLUDE_FROM_COMPILATION_DATABASE, extern/))
3235

3336
# Import the build system.
3437
include /usr/local/src/fly/build.mk

extern/catchorg/flags.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CXXFLAGS_$(d) += \
33
-DCATCH_CONFIG_PREFIX_ALL \
44
-DCATCH_CONFIG_FAST_COMPILE \
55
-DCATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER \
6-
-DCATCH_CONFIG_DEFAULT_REPORTER="\"libfly\"" \
6+
-DCATCH_CONFIG_DEFAULT_REPORTER=\"libfly\" \
77
-Wno-ctor-dtor-privacy \
88
-Wno-float-equal \
99
-Wno-newline-eof \

0 commit comments

Comments
 (0)