Added Unittests #103

Merged
meierj merged 18 commits from mueller/added-unittests into develop 2021-10-07 17:22:24 +02:00
Showing only changes of commit cf04b83cdf - Show all commits

View File

@ -20,7 +20,7 @@ endif()
option(EIVE_BUILD_UNITTESTS "Build Catch2 unittests" OFF) option(EIVE_BUILD_UNITTESTS "Build Catch2 unittests" OFF)
option(EIVE_ADD_ETL_LIB "Add ETL library" ON) option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
option(ADD_JSON_LIB "Add JSON library" ON) option(EIVE_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)
if(NOT FSFW_OSAL) if(NOT FSFW_OSAL)
@ -148,7 +148,7 @@ if(EIVE_ADD_ETL_LIB)
add_subdirectory(${ETL_LIB_PATH}) add_subdirectory(${ETL_LIB_PATH})
endif() endif()
if(ADD_JSON_LIB) if(EIVE_ADD_JSON_LIB)
add_subdirectory(${LIB_JSON_PATH}) add_subdirectory(${LIB_JSON_PATH})
endif() endif()
@ -210,7 +210,7 @@ if(EIVE_ADD_ETL_LIB)
) )
endif() endif()
if(ADD_JSON_LIB) if(EIVE_ADD_JSON_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_JSON_NAME} ${LIB_JSON_NAME}
) )