it compiles again
This commit is contained in:
parent
5c1ee23432
commit
4591994f1b
@ -25,6 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${STM32_CMAKE_PATH}/cmake/stm32_gcc.cmake)
|
|||||||
# Project Name
|
# Project Name
|
||||||
project(fsfw-example-stm32h7-freertos ASM C CXX)
|
project(fsfw-example-stm32h7-freertos ASM C CXX)
|
||||||
|
|
||||||
|
set(OBSW_MAX_SCHEDULED_TCS 200)
|
||||||
|
|
||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
# Pre-Sources preparation
|
# Pre-Sources preparation
|
||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
@ -115,18 +117,43 @@ add_executable(${TARGET_NAME})
|
|||||||
# Add subdirectories
|
# Add subdirectories
|
||||||
add_subdirectory(${BSP_PATH})
|
add_subdirectory(${BSP_PATH})
|
||||||
add_subdirectory(${FSFW_PATH})
|
add_subdirectory(${FSFW_PATH})
|
||||||
# add_subdirectory(${LIB_FSFW_HAL_PATH})
|
|
||||||
add_subdirectory(${COMMON_PATH})
|
add_subdirectory(${COMMON_PATH})
|
||||||
|
|
||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
# Post-Sources preparation
|
# 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.
|
# Add libraries for all sources.
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
${TARGET_NAME}
|
${TARGET_NAME}
|
||||||
PRIVATE ${LIB_FSFW_NAME}
|
PRIVATE ${LIB_FSFW_NAME}
|
||||||
# ${LIB_FSFW_HAL_NAME}
|
etl::etl
|
||||||
${FREERTOS_NAMESPACE}::Heap::4
|
${FREERTOS_NAMESPACE}::Heap::4
|
||||||
${FREERTOS_NAMESPACE}::ARM_CM7
|
${FREERTOS_NAMESPACE}::ARM_CM7
|
||||||
HAL::STM32::H7::M7::RCC
|
HAL::STM32::H7::M7::RCC
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
|
#ifndef FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
|
||||||
#define FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
|
#define FSFWCONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
|
||||||
|
|
||||||
#include <commonSystemObjects.h>
|
#include <commonObjects.h>
|
||||||
|
|
||||||
namespace objects {
|
namespace objects {
|
||||||
enum mission_objects {
|
enum mission_objects {
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit e3a834d8409c394136af43bdf8c084941ed44b53
|
Subproject commit 4b8c0bbde33bafd181a81e1ed81691a079e11d48
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
|||||||
Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f
|
Subproject commit a5245d55866af138b1f2d86d560b59f3a1bd3255
|
Loading…
Reference in New Issue
Block a user