eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update FSFW #70

Merged
meierj merged 44 commits from mueller/update-fsfw into eive/develop 2022-04-27 07:48:57 +02:00
Conversation 0 Commits 44 Files Changed 19 +2 -15
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5a7b98a7d - Show all commits

17
CMakeLists.txt
View File

@ -132,14 +132,14 @@ if(FSFW_BUILD_UNITTESTS)
endif()
endif()
message(STATUS "Finding and/or providing ETL library with version ${FSFW_ETL_LIB_MAJOR_VERSION}")
message(STATUS "Finding and/or providing etl library with version ${FSFW_ETL_LIB_MAJOR_VERSION}")
# Check whether the user has already installed ETL first
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)
message(STATUS
"No ETL installation was found with find_package. Installing and providing "
"No etl installation was found with find_package. Installing and providing "
"etl with FindPackage"
)
include(FetchContent)
@ -153,19 +153,6 @@ if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)
FetchContent_MakeAvailable(etl)
endif()
# Export the ETL library and make it available in the fsfw namespace. This allows user code
# to use the same ETL dependency the framework is using
# You can do this by using the two following directives
# include(fsfw-etl)
# target_link_libraries(${TARGET_NAME} PRIVATE fsfw::etl)
export(
TARGETS ${FSFW_ETL_LIB_NAME}
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/fsfw-etl.cmake"
NAMESPACE fsfw::
)
# Append the export directory to the module path
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}/cmake")
set(FSFW_CORE_INC_PATH "inc")
set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux rtems freertos)