Merge branch 'main' into techdev-sois-eds-draco-preview

jphickey · Apr 17, 2023 · b79992a · b79992a
2 parents 2a30e97 + 6fef38e
commit b79992a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v2.5.0-rc4+dev43
+- update cmake recipe
+- See <https://github.com/nasa/ci_lab/pull/136>
+
 ## Development Build: v2.5.0-rc4+dev39
 - Remove redundant comments
 - Create CHANGELOG.md

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 3.5)
 project(CFS_CI_LAB C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-
-aux_source_directory(fsw/src APP_SRC_FILES)
+set(APP_SRC_FILES
+    fsw/src/ci_lab_app.c
+)
 
 # Create the app module
 add_cfe_app(ci_lab ${APP_SRC_FILES})
 
+target_include_directories(ci_lab PUBLIC
+    fsw/mission_inc
+    fsw/platform_inc
+)
diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -25,7 +25,7 @@
 
 /* Development Build Macro Definitions */
 
-#define CI_LAB_BUILD_NUMBER 39 /*!< Development Build: Number of commits since baseline */
+#define CI_LAB_BUILD_NUMBER 43 /*!< Development Build: Number of commits since baseline */
 #define CI_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */