Fix #139, Moves interface definition files to inc

nasa · Dec 6, 2022 · 730b2e4 · 730b2e4
1 parent 9e2ad8c
commit 730b2e4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git 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 → fsw/inc/to_lab_events.h b/fsw/src/to_lab_events.h → fsw/inc/to_lab_events.h
diff --git a/fsw/src/to_lab_msg.h → fsw/inc/to_lab_msg.h b/fsw/src/to_lab_msg.h → fsw/inc/to_lab_msg.h
diff --git a/fsw/platform_inc/to_lab_msgids.h → fsw/inc/to_lab_msgids.h b/fsw/platform_inc/to_lab_msgids.h → fsw/inc/to_lab_msgids.h
diff --git a/fsw/mission_inc/to_lab_perfids.h → fsw/inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h → fsw/inc/to_lab_perfids.h
diff --git a/fsw/platform_inc/to_lab_sub_table.h → fsw/inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h → fsw/inc/to_lab_sub_table.h