Merge pull request #58 from chillfig/inc

Fix #57, Moves interface definition files to inc
nasa · Dec 23, 2022 · 85fa90d · 85fa90d
2 parents 16c93f4 + 8bd0240
commit 85fa90d
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,5 @@
 project(CFS_MM C)
 
-include_directories(fsw/src)
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-
 set(APP_SRC_FILES
   fsw/src/mm_mem32.c
   fsw/src/mm_app.c
@@ -17,6 +13,9 @@ set(APP_SRC_FILES
 # Create the app module
 add_cfe_app(mm ${APP_SRC_FILES})
 
+# This permits direct access to public headers in the fsw/inc directory
+target_include_directories(mm PUBLIC fsw/inc)
+
 # If UT is enabled, then add the tests from the subdirectory
 # Note that this is an app, and therefore does not provide
 # stub functions, as other entities would not typically make

diff --git a/fsw/src/mm_events.h → fsw/inc/mm_events.h b/fsw/src/mm_events.h → fsw/inc/mm_events.h
diff --git a/fsw/mission_inc/mm_mission_cfg.h → fsw/inc/mm_mission_cfg.h b/fsw/mission_inc/mm_mission_cfg.h → fsw/inc/mm_mission_cfg.h
diff --git a/fsw/src/mm_msg.h → fsw/inc/mm_msg.h b/fsw/src/mm_msg.h → fsw/inc/mm_msg.h
diff --git a/fsw/src/mm_msgdefs.h → fsw/inc/mm_msgdefs.h b/fsw/src/mm_msgdefs.h → fsw/inc/mm_msgdefs.h
diff --git a/fsw/platform_inc/mm_msgids.h → fsw/inc/mm_msgids.h b/fsw/platform_inc/mm_msgids.h → fsw/inc/mm_msgids.h
diff --git a/fsw/mission_inc/mm_perfids.h → fsw/inc/mm_perfids.h b/fsw/mission_inc/mm_perfids.h → fsw/inc/mm_perfids.h
diff --git a/fsw/platform_inc/mm_platform_cfg.h → fsw/inc/mm_platform_cfg.h b/fsw/platform_inc/mm_platform_cfg.h → fsw/inc/mm_platform_cfg.h
diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt
@@ -21,8 +21,10 @@ add_cfe_coverage_stubs("mm_internal"
 # Link with the cfe core stubs and unit test assert libs
 target_link_libraries(coverage-mm_internal-stubs ut_core_api_stubs ut_assert)
 
-# Include and expose unit test utilities includes
+# Include and expose unit test utilities, fsw/inc, and fsw/src includes
 target_include_directories(coverage-mm_internal-stubs PUBLIC utilities)
+target_include_directories(coverage-mm_internal-stubs PUBLIC ../fsw/inc)
+target_include_directories(coverage-mm_internal-stubs PUBLIC ../fsw/src)
 
 # Generate a dedicated "testrunner" executable for each test file
 # Accomplish this by cycling through all the app's source files, there must be