this works
fsfw/fsfw example hosted/pipeline/head There was a failure building this commit Details

This commit is contained in:
Robin Müller 2022-05-08 02:12:08 +02:00
parent e66c02a86a
commit 100910d13c
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
4 changed files with 8 additions and 2 deletions

View File

@ -6,7 +6,7 @@
<codeStyleSettings language="CMake"> <codeStyleSettings language="CMake">
<indentOptions> <indentOptions>
<option name="INDENT_SIZE" value="2" /> <option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" /> <option name="CONTINUATION_INDENT_SIZE" value="0" />
<option name="TAB_SIZE" value="2" /> <option name="TAB_SIZE" value="2" />
</indentOptions> </indentOptions>
</codeStyleSettings> </codeStyleSettings>

View File

@ -22,6 +22,9 @@ endif()
# Project Name # Project Name
project(fsfw-example-hosted C CXX) project(fsfw-example-hosted C CXX)
find_package(fmt 8 CONFIG)
option(FSFW_ADD_FMT_TESTS "Add {fmt} library tests" ON)
################################################################################ ################################################################################
# Pre-Sources preparation # Pre-Sources preparation
################################################################################ ################################################################################
@ -107,6 +110,7 @@ add_subdirectory(${COMMON_PATH})
target_link_libraries(${TARGET_NAME} PRIVATE target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_FSFW_NAME} ${LIB_FSFW_NAME}
${LIB_OS_NAME} ${LIB_OS_NAME}
fmt::fmt
# ${LIB_FSFW_HAL_NAME} # ${LIB_FSFW_HAL_NAME}
) )

View File

@ -1,5 +1,6 @@
#include <bsp_hosted/core/InitMission.h> #include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/core/ObjectFactory.h> #include <bsp_hosted/core/ObjectFactory.h>
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/platform.h> #include <fsfw/platform.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
@ -9,6 +10,7 @@
#include "example/test/MutexExample.h" #include "example/test/MutexExample.h"
#include "example/utility/utility.h" #include "example/utility/utility.h"
#include "fsfw/ipc/MutexGuard.h"
#ifdef PLATFORM_WIN #ifdef PLATFORM_WIN
static const char* COMPILE_PRINTOUT = "Windows"; static const char* COMPILE_PRINTOUT = "Windows";

@ -1 +1 @@
Subproject commit 9d70db97f83e1d8886a5c1372a40124b79cee53d Subproject commit ca501272d839a41c1f6a8d298941905fb99a0877