Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
17 changed files with 75 additions and 78 deletions
Showing only changes of commit c80f06fbcb - Show all commits

View File

@@ -108,9 +108,9 @@ endif()
message(STATUS "Finding and/or providing ETL library")
# Check whether the user has already installed ETL first
find_package(${FSFW_ETL_LIB_NAME} ${FSFW_ETL_LIB_MAJOR_VERSION} QUIET)
# find_package(${FSFW_ETL_LIB_NAME} ${FSFW_ETL_LIB_MAJOR_VERSION} QUIET)
# Not installed, so use FetchContent to download and provide etl
if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)
# if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)
message(STATUS
"No ETL installation was found with find_package. Installing and providing "
"etl with FindPackage"
@@ -124,7 +124,7 @@ if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)
)
FetchContent_MakeAvailable(etl)
endif()
# endif()
set(FSFW_CORE_INC_PATH "inc")