Merge pull request #137 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev45

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: 2.5.0-rc4+dev49
+- update cmake recipe
+- See <https://github.com/nasa/sch_lab/pull/136>
+
 ## Development Build: 2.5.0-rc4+dev45
 - Remove redundant comments
 - See <https://github.com/nasa/sch_lab/pull/126>

CMakeLists.txt

@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.5)
 project(CFS_SCH_LAB C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${to_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc)
+# These references are specifically needed for the table build
+# it is easiest to add them as directory properties so they won't
+# be considered include directories for SCH_LAB itself.
+include_directories(
+    $<TARGET_PROPERTY:ci_lab,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:to_lab,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:sample_app,INTERFACE_INCLUDE_DIRECTORIES>
+)
 
 # Create the app module
 add_cfe_app(sch_lab fsw/src/sch_lab_app.c)
-add_cfe_tables(sch_lab_table fsw/tables/sch_lab_table.c)
+add_cfe_tables(sch_lab fsw/tables/sch_lab_table.c)
+
+target_include_directories(sch_lab PUBLIC
+    fsw/mission_inc
+    fsw/platform_inc
+)

fsw/src/sch_lab_version.h

@@ -25,7 +25,7 @@
  */
 
 /* Development Build Macro Definitions */
-#define SCH_LAB_BUILD_NUMBER 45 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 49 /*!< Development Build: Number of commits since baseline */
 #define SCH_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */