From e26204117372b88b44db39781fd09d57fa7e1882 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 6 Apr 2023 12:06:44 -0400 Subject: [PATCH 1/2] Fix #135, update cmake recipe Prefer target-scope properties over directory scope where applicable --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9070c2a..e4b2e8d 100644 --- 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 +) From 982262685830472f2682320c7e9cc22b81a67c5f Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 10 Apr 2023 07:18:02 -0400 Subject: [PATCH 2/2] Bump to v2.5.0-rc4+dev43 --- CHANGELOG.md | 4 ++++ fsw/src/ci_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c419cc2..d5b4393 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: v2.5.0-rc4+dev43 +- update cmake recipe +- See + ## Development Build: v2.5.0-rc4+dev39 - Remove redundant comments - Create CHANGELOG.md diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index f60bea1..fb7e438 100644 --- 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 */