From e7e2e0691e379bb72e7e5cc0b0bddb28edea5509 Mon Sep 17 00:00:00 2001 From: Justin Figueroa Date: Tue, 6 Dec 2022 12:17:20 -0500 Subject: [PATCH] Fix #139, Moves interface definition files to inc --- CMakeLists.txt | 15 +++++++-------- fsw/{src => inc}/to_lab_events.h | 0 fsw/{src => inc}/to_lab_msg.h | 0 fsw/{platform_inc => inc}/to_lab_msgids.h | 0 fsw/{mission_inc => inc}/to_lab_perfids.h | 0 fsw/{platform_inc => inc}/to_lab_sub_table.h | 0 6 files changed, 7 insertions(+), 8 deletions(-) rename fsw/{src => inc}/to_lab_events.h (100%) rename fsw/{src => inc}/to_lab_msg.h (100%) rename fsw/{platform_inc => inc}/to_lab_msgids.h (100%) rename fsw/{mission_inc => inc}/to_lab_perfids.h (100%) rename fsw/{platform_inc => inc}/to_lab_sub_table.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 803ee01..56b2011 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,17 @@ cmake_minimum_required(VERSION 3.5) project(CFS_TO_LAB C) -# Include source directory for table use -include_directories(fsw/src) - -include_directories(fsw/mission_inc) -include_directories(fsw/platform_inc) -include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc) -include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc) - aux_source_directory(fsw/src APP_SRC_FILES) # Create the app module add_cfe_app(to_lab ${APP_SRC_FILES}) +# This permits direct access to public headers in the fsw/inc, fsw/src, +# ci_lab/fsw/inc, and sample_app/fsw/inc directories +target_include_directories(to_lab PUBLIC fsw/inc) +target_include_directories(to_lab PUBLIC fsw/src) +target_include_directories(to_lab PUBLIC ${ci_lab_MISSION_DIR}/fsw/inc) +target_include_directories(to_lab PUBLIC ${sample_app_MISSION_DIR}/fsw/inc) + add_cfe_tables(TO_LAB_Subs fsw/tables/to_lab_sub.c) diff --git a/fsw/src/to_lab_events.h b/fsw/inc/to_lab_events.h similarity index 100% rename from fsw/src/to_lab_events.h rename to fsw/inc/to_lab_events.h diff --git a/fsw/src/to_lab_msg.h b/fsw/inc/to_lab_msg.h similarity index 100% rename from fsw/src/to_lab_msg.h rename to fsw/inc/to_lab_msg.h diff --git a/fsw/platform_inc/to_lab_msgids.h b/fsw/inc/to_lab_msgids.h similarity index 100% rename from fsw/platform_inc/to_lab_msgids.h rename to fsw/inc/to_lab_msgids.h diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/inc/to_lab_perfids.h similarity index 100% rename from fsw/mission_inc/to_lab_perfids.h rename to fsw/inc/to_lab_perfids.h diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/inc/to_lab_sub_table.h similarity index 100% rename from fsw/platform_inc/to_lab_sub_table.h rename to fsw/inc/to_lab_sub_table.h