From e7cba346daf6fa0436c861dbb3d0984224bbfebc Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 2 Sep 2021 11:39:25 +0200 Subject: [PATCH] Use relative paths for panic.h Avoids adding the main directory as an include path --- src/modules/motion.cpp | 2 +- tests/unit/modules/motion/CMakeLists.txt | 4 +--- tests/unit/modules/stubs/stub_panic.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/motion.cpp b/src/modules/motion.cpp index 3119144..879ffea 100644 --- a/src/modules/motion.cpp +++ b/src/modules/motion.cpp @@ -1,5 +1,5 @@ #include "motion.h" -#include "panic.h" +#include "../panic.h" // TODO: use proper timer abstraction #ifdef __AVR__ diff --git a/tests/unit/modules/motion/CMakeLists.txt b/tests/unit/modules/motion/CMakeLists.txt index 7aafdc4..536a799 100644 --- a/tests/unit/modules/motion/CMakeLists.txt +++ b/tests/unit/modules/motion/CMakeLists.txt @@ -1,7 +1,5 @@ # common include and source directories -set(include_common ${CMAKE_SOURCE_DIR}/src/modules ${CMAKE_SOURCE_DIR}/src/hal - ${CMAKE_SOURCE_DIR}/src - ) +set(include_common ${CMAKE_SOURCE_DIR}/src/modules ${CMAKE_SOURCE_DIR}/src/hal) set(source_common ${CMAKE_SOURCE_DIR}/src/modules/motion.cpp ${CMAKE_SOURCE_DIR}/src/modules/speed_table.cpp diff --git a/tests/unit/modules/stubs/stub_panic.cpp b/tests/unit/modules/stubs/stub_panic.cpp index 112251b..d3ff7d0 100644 --- a/tests/unit/modules/stubs/stub_panic.cpp +++ b/tests/unit/modules/stubs/stub_panic.cpp @@ -1,4 +1,4 @@ -#include "panic.h" +#include "../panic.h" // For retrival during tests ErrorCode panic_code = ErrorCode::RUNNING;