Fix nasa#348, Move interface definition files to inc

chillfig · Dec 6, 2022 · 77fee11 · 77fee11
1 parent b9a8898
commit 77fee11
Show file tree

Hide file tree

Showing 10 changed files with 3,024 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(CFS_CF C)
 
-include_directories(fsw/src)
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
 include_directories(${CFS_IO_LIB_MISSION_DIR}/fsw/public_inc)
 
 set(APP_SRC_FILES
@@ -24,6 +21,10 @@ set(APP_SRC_FILES
 # Create the app module
 add_cfe_app(cf ${APP_SRC_FILES})
 
+# This permits direct access to public headers in the fsw/inc dir
+target_include_directories(cf PUBLIC fsw/inc)
+target_include_directories(cf PUBLIC fsw/src)
+
 # configuration table
 add_cfe_tables(cf fsw/tables/cf_def_config.c)
 

diff --git a/fsw/src/cf_events.h → fsw/inc/cf_events.h b/fsw/src/cf_events.h → fsw/inc/cf_events.h
diff --git a/fsw/src/cf_msg.h → fsw/inc/cf_msg.h b/fsw/src/cf_msg.h → fsw/inc/cf_msg.h
diff --git a/fsw/platform_inc/cf_msgids.h → fsw/inc/cf_msgids.h b/fsw/platform_inc/cf_msgids.h → fsw/inc/cf_msgids.h
diff --git a/fsw/mission_inc/cf_perfids.h → fsw/inc/cf_perfids.h b/fsw/mission_inc/cf_perfids.h → fsw/inc/cf_perfids.h
diff --git a/fsw/platform_inc/cf_platform_cfg.h → fsw/inc/cf_platform_cfg.h b/fsw/platform_inc/cf_platform_cfg.h → fsw/inc/cf_platform_cfg.h
diff --git a/fsw/src/cf_tbldefs.h → fsw/inc/cf_tbldefs.h b/fsw/src/cf_tbldefs.h → fsw/inc/cf_tbldefs.h