From cc5b10b199f6f770a3fc3179614ae3bad9901d7b Mon Sep 17 00:00:00 2001 From: Justin Figueroa Date: Tue, 6 Dec 2022 12:09:45 -0500 Subject: [PATCH] Fix #131, Moves interface definition files to inc --- CMakeLists.txt | 13 +++++++------ README.md | 2 +- fsw/{mission_inc => inc}/sch_lab_perfids.h | 0 fsw/{platform_inc => inc}/sch_lab_table.h | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename fsw/{mission_inc => inc}/sch_lab_perfids.h (100%) rename fsw/{platform_inc => inc}/sch_lab_table.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ef375d..f59f2c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,13 @@ cmake_minimum_required(VERSION 3.5) project(CFS_SCH_LAB C) -include_directories(fsw/mission_inc) -include_directories(fsw/platform_inc) -include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc) -include_directories(${to_lab_MISSION_DIR}/fsw/platform_inc) -include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc) - # Create the app module add_cfe_app(sch_lab fsw/src/sch_lab_app.c) add_cfe_tables(sch_lab_table fsw/tables/sch_lab_table.c) + +# This permits direct access to public headers in the fsw/inc, +# ci_lab/fsw/inc, to_lab/fsw/inc, and sample_app/fsw/inc directories +target_include_directories(to_lab PUBLIC fsw/inc) +target_include_directories(to_lab PUBLIC ${ci_lab_MISSION_DIR}/fsw/inc) +target_include_directories(to_lab PUBLIC ${to_lab_MISSION_DIR}/fsw/inc) +target_include_directories(to_lab PUBLIC ${sample_app_MISSION_DIR}/fsw/inc) \ No newline at end of file diff --git a/README.md b/README.md index a1094a9..b0ec5f2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This lab application is a non-flight packet scheduler application for the cFS Bu sch_lab is a simple packet scheduler application with a one second resolution. -To change the list of packets that sch_lab sends out, edit the schedule table located in the platform include file: fsw/platform_inc/sch_lab_sched_tab.h +To change the list of packets that sch_lab sends out, edit the schedule table located in the tables directory: fsw/tables/sch_lab_table.c ## Known issues diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/inc/sch_lab_perfids.h similarity index 100% rename from fsw/mission_inc/sch_lab_perfids.h rename to fsw/inc/sch_lab_perfids.h diff --git a/fsw/platform_inc/sch_lab_table.h b/fsw/inc/sch_lab_table.h similarity index 100% rename from fsw/platform_inc/sch_lab_table.h rename to fsw/inc/sch_lab_table.h