Skip to content

Commit 8f08422

Browse files
author
Danilo
committed
fix including sanitizers
1 parent 6d67c95 commit 8f08422

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
include(cmake/depthaiOptions.cmake)
4+
include("${CMAKE_TOOLCHAIN_FILE}")
45

56
if(WIN32)
67
add_compile_options(/MP)
@@ -64,7 +65,7 @@ else()
6465
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
6566
endif()
6667

67-
68+
message(STATUS "CMAKE_TOOLCHAIN_FILE_3 = ${CMAKE_TOOLCHAIN_FILE}")
6869
# Create depthai project
6970
project(depthai VERSION "3.0.0" LANGUAGES CXX C)
7071
set(DEPTHAI_PRE_RELEASE_TYPE "") # Valid options are "alpha", "beta", "rc", ""
@@ -1102,8 +1103,6 @@ endif()
11021103
# Sanitizers
11031104
########################
11041105
if(DEPTHAI_SANITIZE)
1105-
set(SANITIZE_ADDRESS ON CACHE BOOL "Enable AddressSanitizer for sanitized targets.")
1106-
set(SANITIZE_UNDEFINED ON CACHE BOOL "Enable UndefinedBehaviorSanitizer for sanitized targets.")
11071106
find_package(Sanitizers)
11081107
add_sanitizers(${TARGET_CORE_NAME})
11091108
if(DEPTHAI_HAVE_OPENCV_SUPPORT AND NOT DEPTHAI_MERGED_TARGET)

cmake/sanitizers/FindASan.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ set(FLAG_CANDIDATES
3535

3636

3737
if (SANITIZE_ADDRESS AND (SANITIZE_THREAD OR SANITIZE_MEMORY))
38+
message(STATUS "SANITIZE_THREAD = ${SANITIZE_THREAD}")
39+
message(STATUS "SANITIZE_ADDRESS = ${SANITIZE_ADDRESS}")
3840
message(FATAL_ERROR "AddressSanitizer is not compatible with "
3941
"ThreadSanitizer or MemorySanitizer.")
4042
endif ()

cmake/sanitizers/FindTSan.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set(FLAG_CANDIDATES
2828
"-g -fsanitize=thread"
2929
)
3030

31-
31+
message("pucpuc")
3232
# ThreadSanitizer is not compatible with MemorySanitizer.
3333
if (SANITIZE_THREAD AND SANITIZE_MEMORY)
3434
message(FATAL_ERROR "ThreadSanitizer is not compatible with "

cmake/toolchain/asan-ubsan.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ set(CMAKE_SHARED_LINKER_FLAGS ${_internal_flags_sanitizer})
99
set(CMAKE_SHARED_LINKER_FLAGS_INIT ${_internal_flags_sanitizer})
1010
set(CMAKE_MODULE_LINKER_FLAGS ${_internal_flags_sanitizer})
1111
set(CMAKE_MODULE_LINKER_FLAGS_INIT ${_internal_flags_sanitizer})
12-
set(DEPTHAI_SANITIZE ON CACHE BOOL)
12+
set(DEPTHAI_SANITIZE ON)
13+
set(SANITIZE_ADDRESS ON)
14+
set(SANITIZE_UNDEFINED ON)
15+
set(SANITIZE_THREAD OFF)
1316
set(_internal_flags_sanitizer)

cmake/toolchain/tsan.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
message(STATUS ">>> Toolchain loaded: ${CMAKE_CURRENT_LIST_FILE}")
12
set(_internal_flags_sanitizer "-fno-omit-frame-pointer -fsanitize=thread")
23
set(CMAKE_C_FLAGS ${_internal_flags_sanitizer})
34
set(CMAKE_CXX_FLAGS ${_internal_flags_sanitizer})
@@ -9,6 +10,8 @@ set(CMAKE_SHARED_LINKER_FLAGS ${_internal_flags_sanitizer})
910
set(CMAKE_SHARED_LINKER_FLAGS_INIT ${_internal_flags_sanitizer})
1011
set(CMAKE_MODULE_LINKER_FLAGS ${_internal_flags_sanitizer})
1112
set(CMAKE_MODULE_LINKER_FLAGS_INIT ${_internal_flags_sanitizer})
12-
set(DEPTHAI_SANITIZE ON CACHE BOOL)
13-
set(SANITIZE_THREAD ON CACHE BOOL)
13+
set(DEPTHAI_SANITIZE ON)
14+
set(SANITIZE_ADDRESS OFF)
15+
set(SANITIZE_UNDEFINED OFF)
16+
set(SANITIZE_THREAD ON)
1417
set(_internal_flags_sanitizer)

0 commit comments

Comments
 (0)