From 4591994f1b78472f630c872839c3c81c7476b17d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 22 May 2022 17:45:44 +0200 Subject: [PATCH] it compiles again --- CMakeLists.txt | 31 +++++++++++++++++-- .../fsfwconfig/objects/systemObjectList.h | 2 +- cmake/stm32-cmake | 2 +- fsfw | 2 +- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 832b8ee..d9f0a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${STM32_CMAKE_PATH}/cmake/stm32_gcc.cmake) # Project Name project(fsfw-example-stm32h7-freertos ASM C CXX) +set(OBSW_MAX_SCHEDULED_TCS 200) + # ############################################################################## # Pre-Sources preparation # ############################################################################## @@ -115,18 +117,43 @@ add_executable(${TARGET_NAME}) # Add subdirectories add_subdirectory(${BSP_PATH}) add_subdirectory(${FSFW_PATH}) -# add_subdirectory(${LIB_FSFW_HAL_PATH}) add_subdirectory(${COMMON_PATH}) # ############################################################################## # Post-Sources preparation # ############################################################################## + +# Check whether the user has already installed ETL first +# find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET) +# Not installed, so use FetchContent to download and provide etl +# if(NOT etl_FOUND) +message( + STATUS + "No ETL installation was found with find_package. Installing and providing " + "etl with FindPackage") +include(FetchContent) + +FetchContent_Declare( + etl + GIT_REPOSITORY https://github.com/ETLCPP/etl + GIT_TAG ${FSFW_ETL_LIB_VERSION}) + +list(APPEND FSFW_FETCH_CONTENT_TARGETS etl) +# endif() + +# The documentation for FetchContent recommends declaring all the dependencies +# before making them available. We make all declared dependency available here +# after their declaration +if(FSFW_FETCH_CONTENT_TARGETS) + FetchContent_MakeAvailable(${FSFW_FETCH_CONTENT_TARGETS}) +endif() + # Add libraries for all sources. target_link_libraries( ${TARGET_NAME} PRIVATE ${LIB_FSFW_NAME} - # ${LIB_FSFW_HAL_NAME} + etl::etl ${FREERTOS_NAMESPACE}::Heap::4 ${FREERTOS_NAMESPACE}::ARM_CM7 HAL::STM32::H7::M7::RCC diff --git a/bsp_stm32h7_freertos/fsfwconfig/objects/systemObjectList.h b/bsp_stm32h7_freertos/fsfwconfig/objects/systemObjectList.h index cee80bd..917818d 100644 --- a/bsp_stm32h7_freertos/fsfwconfig/objects/systemObjectList.h +++ b/bsp_stm32h7_freertos/fsfwconfig/objects/systemObjectList.h @@ -1,7 +1,7 @@ #ifndef FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ #define FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ -#include +#include namespace objects { enum mission_objects { diff --git a/cmake/stm32-cmake b/cmake/stm32-cmake index e3a834d..4b8c0bb 160000 --- a/cmake/stm32-cmake +++ b/cmake/stm32-cmake @@ -1 +1 @@ -Subproject commit e3a834d8409c394136af43bdf8c084941ed44b53 +Subproject commit 4b8c0bbde33bafd181a81e1ed81691a079e11d48 diff --git a/fsfw b/fsfw index 5764144..a5245d5 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f +Subproject commit a5245d55866af138b1f2d86d560b59f3a1bd3255