best solution for now..
This commit is contained in:
parent
d03949ee2d
commit
497ff2442a
@ -14,17 +14,18 @@ set(STM32_CMAKE_PATH "${CMAKE_SCRIPT_PATH}/stm32-cmake")
|
||||
set(STM32_CUBE_H7_PATH STM32CubeH7)
|
||||
set(STM32_TOOLCHAIN_PATH $ENV{STM32_TOOLCHAIN_PATH})
|
||||
set(TARGET_TRIPLET "arm-none-eabi")
|
||||
set(FSFW_OSAL
|
||||
freertos
|
||||
CACHE STRING "OS for the FSFW")
|
||||
set(STM32_ADD_NETWORKING_CODE ON)
|
||||
set(FSFW_HAL_ADD_STM32H7 ON)
|
||||
|
||||
# This call has to come before the project call
|
||||
set(CMAKE_TOOLCHAIN_FILE ${STM32_CMAKE_PATH}/cmake/stm32_gcc.cmake)
|
||||
# Project Name
|
||||
project(fsfw-example-stm32h7-freertos ASM C CXX)
|
||||
|
||||
set(FSFW_OSAL
|
||||
freertos
|
||||
CACHE STRING "OS for the FSFW")
|
||||
set(STM32_ADD_NETWORKING_CODE ON)
|
||||
set(FSFW_HAL_ADD_STM32H7 ON)
|
||||
|
||||
set(OBSW_MAX_SCHEDULED_TCS 200)
|
||||
|
||||
# ##############################################################################
|
||||
@ -124,22 +125,24 @@ add_subdirectory(${COMMON_PATH})
|
||||
# ##############################################################################
|
||||
|
||||
# Check whether the user has already installed ETL first
|
||||
find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
|
||||
# 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)
|
||||
# if(NOT etl_FOUND)
|
||||
# There are issues using find_package. For now, always use FetchContent
|
||||
# See this github issue: https://github.com/ETLCPP/etl/issues/548
|
||||
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})
|
||||
FetchContent_Declare(
|
||||
etl
|
||||
GIT_REPOSITORY https://github.com/ETLCPP/etl
|
||||
GIT_TAG ${FSFW_ETL_LIB_VERSION})
|
||||
|
||||
list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
|
||||
endif()
|
||||
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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 4b8c0bbde33bafd181a81e1ed81691a079e11d48
|
||||
Subproject commit 5ae35e844c2b223f7bdacdf003f61791174848c6
|
Loading…
Reference in New Issue
Block a user