From 100910d13c966e79a9eeec49c5a484cf0cfbf4ce Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 8 May 2022 02:12:08 +0200 Subject: [PATCH] this works --- .idea/codeStyles/Project.xml | 2 +- CMakeLists.txt | 4 ++++ bsp_hosted/main.cpp | 2 ++ example_common | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 54ad61e..0f3b1a4 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -6,7 +6,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c881b42..fa83b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ endif() # Project Name project(fsfw-example-hosted C CXX) +find_package(fmt 8 CONFIG) +option(FSFW_ADD_FMT_TESTS "Add {fmt} library tests" ON) + ################################################################################ # Pre-Sources preparation ################################################################################ @@ -107,6 +110,7 @@ add_subdirectory(${COMMON_PATH}) target_link_libraries(${TARGET_NAME} PRIVATE ${LIB_FSFW_NAME} ${LIB_OS_NAME} + fmt::fmt # ${LIB_FSFW_HAL_NAME} ) diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp index 1465cb2..3506181 100644 --- a/bsp_hosted/main.cpp +++ b/bsp_hosted/main.cpp @@ -1,5 +1,6 @@ #include #include + #include #include #include @@ -9,6 +10,7 @@ #include "example/test/MutexExample.h" #include "example/utility/utility.h" +#include "fsfw/ipc/MutexGuard.h" #ifdef PLATFORM_WIN static const char* COMPILE_PRINTOUT = "Windows"; diff --git a/example_common b/example_common index 9d70db9..ca50127 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit 9d70db97f83e1d8886a5c1372a40124b79cee53d +Subproject commit ca501272d839a41c1f6a8d298941905fb99a0877