eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1fe5325ed - Show all commits

7
CMakeLists.txt
View File

@ -18,7 +18,8 @@ if(TGT_BSP MATCHES "arm/q7s")
option(BUILD_Q7S_SIMPLE_MODE OFF "Simple mode with a minimal main function") option(BUILD_Q7S_SIMPLE_MODE OFF "Simple mode with a minimal main function")
endif() endif()
option(ADD_ETL_LIB "Add ETL library" ON) option(EIVE_BUILD_UNITTESTS "Build Catch2 unittests" OFF)
option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
option(ADD_JSON_LIB "Add JSON library" ON) option(ADD_JSON_LIB "Add JSON library" ON)
option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF) option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
@ -143,7 +144,7 @@ set(FSFW_ADDITIONAL_INC_PATHS
# Add executable # Add executable
add_executable(${TARGET_NAME}) add_executable(${TARGET_NAME})
if(ADD_ETL_LIB) if(EIVE_ADD_ETL_LIB)
add_subdirectory(${ETL_LIB_PATH}) add_subdirectory(${ETL_LIB_PATH})
endif() endif()
@ -203,7 +204,7 @@ if(NOT EIVE_BUILD_WATCHDOG)
endif() endif()
endif() endif()
if(ADD_ETL_LIB) if(EIVE_ADD_ETL_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_ETL_NAME} ${LIB_ETL_NAME}
) )