Merge pull request #204 from nasa/integration-candidate

sample_app Integration candidate: Caelum-rc4+dev45
nasa · Apr 12, 2023 · 6794db4 · 6794db4
2 parents a410436 + 07eddd6
commit 6794db4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v1.3.0-rc4+dev39
+- update cmake recipe
+- See <https://github.com/nasa/sample_app/pull/203>
+
 ## Development Build: v1.3.0-rc4+dev35
 - Remove redundant comments
 - Create CHANGELOG.md

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(CFE_SAMPLE_APP C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-
 # Create the app module
 add_cfe_app(sample_app fsw/src/sample_app.c)
 
@@ -11,7 +8,12 @@ add_cfe_app(sample_app fsw/src/sample_app.c)
 add_cfe_app_dependency(sample_app sample_lib)
 
 # Add table
-add_cfe_tables(sampleAppTable fsw/tables/sample_app_tbl.c)
+add_cfe_tables(sample_app fsw/tables/sample_app_tbl.c)
+
+target_include_directories(sample_app PUBLIC
+  fsw/mission_inc
+  fsw/platform_inc
+)
 
 # If UT is enabled, then add the tests from the subdirectory
 # Note that this is an app, and therefore does not provide

diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h
@@ -27,7 +27,7 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER 35 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_APP_BUILD_NUMBER 39 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_APP_BUILD_BASELINE \
     "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */