From 1cc844a69db2a8918e049ec8ea72aa9327769e37 Mon Sep 17 00:00:00 2001 From: Martin Killenberg <martin.killenberg@desy.de> Date: Tue, 11 Aug 2020 12:49:48 +0200 Subject: [PATCH] renamed flag USE_TSAN to ENABLE_TSAN --- cmake/enable_code_coverage_report.cmake | 6 +++--- cmake/set_default_flags.cmake | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/enable_code_coverage_report.cmake b/cmake/enable_code_coverage_report.cmake index 53c9e1b..733be73 100644 --- a/cmake/enable_code_coverage_report.cmake +++ b/cmake/enable_code_coverage_report.cmake @@ -25,9 +25,9 @@ # ####################################################################################################################### -string(TOUPPER "${USE_TSAN}" use_tsanitizer_uppercase) -IF(use_tsanitizer_uppercase STREQUAL "TRUE") - message(WARNING "The USE_TSAN set to true. Code coverage cannot be enabled, becasue it requires -O0 flag and USE_TSAN requires -O1.") +string(TOUPPER "${ENABLE_TSAN}" enable_tsanitizer_uppercase) +IF(enable_tsanitizer_uppercase STREQUAL "TRUE") + message(WARNING "The ENABLE_TSAN set to true. Code coverage cannot be enabled, becasue it requires -O0 flag and ENABLE_TSAN requires -O1.") ELSE() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 --coverage") # The make coverage command is only available in debug mode. Also diff --git a/cmake/set_default_flags.cmake b/cmake/set_default_flags.cmake index 0c2546c..4cae9ed 100644 --- a/cmake/set_default_flags.cmake +++ b/cmake/set_default_flags.cmake @@ -29,8 +29,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${PROJECT_NAME}_C_FLAGS} -Wall -Wextra -Ws set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -g") -string(TOUPPER "${USE_TSAN}" use_tsanitizer_uppercase) -IF(use_tsanitizer_uppercase STREQUAL "TRUE") +string(TOUPPER "${ENABLE_TSAN}" enable_tsanitizer_uppercase) +IF(enable_tsanitizer_uppercase STREQUAL "TRUE") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O1 -fsanitize=thread") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O1 -fsanitize=thread") ELSE() -- GitLab