Skip to content

Commit 3358b29

Browse files
Fix memory sanitizer to be on by default (#3183)
* forgot to add the dollar sign branch around the BUILD_TESTING variable * removing dead code * Fixing build issues --------- Co-authored-by: M Starch <LeStarch@googlemail.com>
1 parent 9b9fff1 commit 3358b29

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

cmake/options.cmake

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ option(FPRIME_CHECK_FRAMEWORK_VERSION "(Internal) Check framework version when b
204204
#
205205
# e.g. `-DENABLE_SANITIZER_ADDRESS=OFF`
206206
####
207-
option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" BUILD_TESTING)
207+
option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" ${BUILD_TESTING})
208208

209209
####
210210
# `ENABLE_SANITIZER_LEAK:`
@@ -223,7 +223,7 @@ option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" BUILD_TESTING)
223223
#
224224
# e.g. `-DENABLE_SANITIZER_LEAK=OFF`
225225
####
226-
option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" BUILD_TESTING)
226+
option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" ${BUILD_TESTING})
227227

228228
####
229229
# `ENABLE_SANITIZER_UNDEFINED_BEHAVIOR:`
@@ -240,7 +240,7 @@ option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" BUILD_TESTING)
240240
#
241241
# e.g. `-DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=ON`
242242
####
243-
option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer" BUILD_TESTING)
243+
option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer" ${BUILD_TESTING})
244244

245245
####
246246
# `ENABLE_SANITIZER_THREAD:`
@@ -259,12 +259,9 @@ option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer"
259259
####
260260
option(ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF)
261261

262-
# Backwards compatibility, when build type=TESTING BUILD_TESTING is on
263-
string(TOUPPER "${CMAKE_BUILD_TYPE}" FPRIME_BUILD_TYPE)
264-
if (FPRIME_BUILD_TYPE STREQUAL "TESTING")
265-
else()
266-
option(BUILD_TESTING OFF)
267-
endif()
262+
# CTest inclusion will default BUILD_TESTING to ON but F Prime uses a default of OFF instead
263+
# Must come before include(CTest)
264+
option(BUILD_TESTING "Enable unit testing in the build" OFF)
268265
include(CTest)
269266

270267
####

0 commit comments

Comments
 (0)