Skip to content

Commit 3fb34cc

Browse files
author
Danilo
committed
run santizier tests
1 parent 1283aa0 commit 3fb34cc

File tree

2 files changed

+8
-31
lines changed

2 files changed

+8
-31
lines changed

CMakeLists.txt

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

3-
include(cmake/depthaiOptions.cmake)
4-
include("${CMAKE_TOOLCHAIN_FILE}")
5-
message(STATUS "CMAKE_TOOLCHAIN_FILE = ${CMAKE_TOOLCHAIN_FILE}")
6-
message(STATUS "DEPTHAI_ENABLE_DEVICE_RVC4_FW = ${DEPTHAI_ENABLE_DEVICE_RVC4_FW}")
7-
message(STATUS "DEPTHAI_SANITIZE = ${DEPTHAI_SANITIZE}")
8-
message(STATUS "SANITIZE_THREAD = ${SANITIZE_THREAD}")
9-
message(STATUS "DEPTHAI_DEVICE_RVC4_VERSION = ${DEPTHAI_DEVICE_RVC4_VERSION}")
10-
3+
if(CMAKE_TOOLCHAIN_FILE)
4+
message(STATUS "Including toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
5+
include("${CMAKE_TOOLCHAIN_FILE}")
6+
else()
7+
message(STATUS "No toolchain file specified, skipping include.")
8+
endif()
119

1210
if(WIN32)
1311
add_compile_options(/MP)
@@ -53,13 +51,6 @@ set(CMAKE_TOOLCHAIN_FILE "" CACHE FILEPATH "CMake toolchain path")
5351
# Create a custom toolchain to pass certain options to dependencies
5452
set(gen_toolchain "${CMAKE_CURRENT_BINARY_DIR}/generated/toolchain.cmake")
5553

56-
message(STATUS "CMAKE_TOOLCHAIN_FILE_2 = ${CMAKE_TOOLCHAIN_FILE}")
57-
message(STATUS "DEPTHAI_ENABLE_DEVICE_RVC4_FW = ${DEPTHAI_ENABLE_DEVICE_RVC4_FW}")
58-
message(STATUS "DEPTHAI_SANITIZE = ${DEPTHAI_SANITIZE}")
59-
message(STATUS "SANITIZE_THREAD = ${SANITIZE_THREAD}")
60-
message(STATUS "DEPTHAI_DEVICE_RVC4_VERSION = ${DEPTHAI_DEVICE_RVC4_VERSION}")
61-
62-
6354
if(EXISTS "${gen_toolchain}" AND ("${_INTERNAL_DEPTHAI_ORIGINAL_CMAKE_TOOLCHAIN_FILE}" STREQUAL "${CMAKE_TOOLCHAIN_FILE}" OR NOT "${CMAKE_TOOLCHAIN_FILE}" STREQUAL ""))
6455
message(STATUS "Using existing generated toolchain")
6556
else()
@@ -78,7 +69,6 @@ else()
7869
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
7970
endif()
8071

81-
message(STATUS "CMAKE_TOOLCHAIN_FILE_3 = ${CMAKE_TOOLCHAIN_FILE}")
8272
# Create depthai project
8373
project(depthai VERSION "3.0.0" LANGUAGES CXX C)
8474
set(DEPTHAI_PRE_RELEASE_TYPE "") # Valid options are "alpha", "beta", "rc", ""
@@ -698,19 +688,6 @@ if(DEPTHAI_ENABLE_DEVICE_RVC3_FW)
698688
list(APPEND RESOURCE_COMPILED_FILES ${DEPTHAI_DEVICE_KB_RESOURCE_LIST})
699689
endif()
700690

701-
# --- User overlay toolchain (optional) ---
702-
# set(DEPTHAI_USER_TOOLCHAIN "" CACHE PATH "Extra toolchain to include after vcpkg")
703-
# if(DEPTHAI_USER_TOOLCHAIN AND EXISTS "${DEPTHAI_USER_TOOLCHAIN}")
704-
# message(STATUS "Including user toolchain: ${DEPTHAI_USER_TOOLCHAIN}")
705-
# include("${DEPTHAI_USER_TOOLCHAIN}")
706-
# endif()
707-
708-
message(STATUS "CMAKE_TOOLCHAIN_FILE_4 = ${CMAKE_TOOLCHAIN_FILE}")
709-
message(STATUS "DEPTHAI_ENABLE_DEVICE_RVC4_FW = ${DEPTHAI_ENABLE_DEVICE_RVC4_FW}")
710-
message(STATUS "DEPTHAI_SANITIZE = ${DEPTHAI_SANITIZE}")
711-
message(STATUS "SANITIZE_THREAD = ${SANITIZE_THREAD}")
712-
message(STATUS "DEPTHAI_DEVICE_RVC4_VERSION = ${DEPTHAI_DEVICE_RVC4_VERSION}")
713-
714691
if(DEPTHAI_ENABLE_DEVICE_RVC4_FW)
715692
if(DEPTHAI_SANITIZE AND SANITIZE_THREAD)
716693
string(APPEND DEPTHAI_DEVICE_RVC4_VERSION "-tsan")

tests/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ ENV PATH="/workspace/venv/bin:$PATH"
103103

104104
# Set toolchain path only if flavor != vanilla
105105
RUN if [ "$FLAVOR" != "vanilla" ]; then \
106-
export CMAKE_TOOLCHAIN_PATH=/workspace/cmake/toolchain/${FLAVOR}.cmake && \
107-
echo "Using toolchain: $CMAKE_TOOLCHAIN_PATH"; \
106+
export CMAKE_TOOLCHAIN_FILE=/workspace/cmake/toolchain/${FLAVOR}.cmake && \
107+
echo "Using toolchain: $CMAKE_TOOLCHAIN_FILE"; \
108108
else \
109109
echo "Using vanilla flavor (no toolchain)"; \
110110
fi && \

0 commit comments

Comments
 (0)