Skip to content

Commit a9c4311

Browse files
committed
fix multi-config build for TSan
1 parent 00d0ff2 commit a9c4311

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ FetchContent_Declare(
2424
)
2525
FetchContent_MakeAvailable(benchmark)
2626

27+
set(CMAKE_CONFIGURATION_TYPES Debug Release TSan)
28+
set(CMAKE_CXX_FLAGS[variant=Debug] "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address,undefined,leak")
29+
set(CMAKE_CXX_FLAGS[variant=TSan] "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=thread")
30+
2731
set(CMAKE_CXX_STANDARD 17)
2832
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
2933
set(CMAKE_CXX_EXTENSIONS FALSE)
@@ -33,9 +37,6 @@ set(CMAKE_INSTALL_RPATH $ORIGIN/../lib)
3337
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
3438
set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
3539

36-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address,undefined,leak")
37-
set(CMAKE_CXX_FLAGS_TSAN "${CMAKE_CXX_FLAGS_TSAN} -fsanitize=thread")
38-
3940
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
4041
add_compile_options(-Wno-error=cpp)
4142

build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -eux
44

55
cmake -G "Ninja Multi-Config" -B build
66

7-
#Debug,TSan,Release
87
config=${1:-Debug}
98

109
cmake --build build --config ${config}

ci.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)