summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-06-27 14:38:25 +1000
committerjacqueline <me@jacqueline.id.au>2024-06-27 14:38:25 +1000
commited4460616258870c4666387625a4d8ce0f8636e1 (patch)
treedc02a6656b467c6c979e83a6eb6a72e9d9aff9fe /lib
parent0bbf279e5ece83756f1463081a1ab6754721085e (diff)
downloadtangara-fw-ed4460616258870c4666387625a4d8ce0f8636e1.tar.gz
fix catch2 build options not being applied + enable benchmarking
Diffstat (limited to 'lib')
-rw-r--r--lib/catch2/CMakeLists.txt7
-rw-r--r--lib/catch2/catch_runner.cpp6
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/catch2/CMakeLists.txt b/lib/catch2/CMakeLists.txt
index 1811c2d6..173a81ed 100644
--- a/lib/catch2/CMakeLists.txt
+++ b/lib/catch2/CMakeLists.txt
@@ -2,7 +2,6 @@
#
# SPDX-License-Identifier: GPL-3.0-only
-idf_component_register(
- SRCS "catch_runner.cpp"
- INCLUDE_DIRS "include"
- REQUIRES "console")
+idf_component_register(SRCS "catch_runner.cpp" INCLUDE_DIRS "include")
+
+target_compile_options(${COMPONENT_LIB} PUBLIC -DCATCH_CONFIG_NO_POSIX_SIGNALS -DCATCH_CONFIG_FAST_COMPILE -DCATCH_CONFIG_ENABLE_BENCHMARKING)
diff --git a/lib/catch2/catch_runner.cpp b/lib/catch2/catch_runner.cpp
index ba4fa57e..d3bd5124 100644
--- a/lib/catch2/catch_runner.cpp
+++ b/lib/catch2/catch_runner.cpp
@@ -9,12 +9,6 @@
#define CATCH_CONFIG_RUNNER
#include "catch2/catch.hpp"
-#include <stdio.h>
-#include <string.h>
-#include "esp_console.h"
-#include "esp_log.h"
-#include "esp_system.h"
-
// There must be exactly on Session instance at all times; attempting to destroy
// this will result in memory corruption.
static Catch::Session sCatchSession;