From d644a45c3411cd9e4f25eefb685047b37dc377ac Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Jul 2022 10:35:45 +0200 Subject: [PATCH] use public linkage now --- .idea/cmake.xml | 6 +++--- .run/fsfw-example-hosted.run.xml | 2 +- CMakeLists.txt | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.idea/cmake.xml b/.idea/cmake.xml index 8552c05..93f75d9 100644 --- a/.idea/cmake.xml +++ b/.idea/cmake.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/.run/fsfw-example-hosted.run.xml b/.run/fsfw-example-hosted.run.xml index 9d5e7e5..563a820 100644 --- a/.run/fsfw-example-hosted.run.xml +++ b/.run/fsfw-example-hosted.run.xml @@ -1,5 +1,5 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cc1859..8def49e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,15 +107,12 @@ add_subdirectory(${COMMON_PATH}) # Add libraries for all sources. target_link_libraries( - ${TARGET_NAME} PRIVATE ${LIB_FSFW_NAME} ${LIB_OS_NAME} - # ${LIB_FSFW_HAL_NAME} -) + ${TARGET_NAME} PRIVATE ${LIB_FSFW_NAME} ${LIB_OS_NAME}) # Add include paths for all sources. target_include_directories( ${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} ${FSFW_CONFIG_PATH} - etl::etl) + ${CMAKE_CURRENT_BINARY_DIR} ${FSFW_CONFIG_PATH}) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_link_options(${TARGET_NAME} PRIVATE "-Wl,-Map=${TARGET_NAME}.map")