From d8d38a991958c86024b32bc3e18a58fb6eaddb3d Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 28 Jun 2022 12:24:49 -0400 Subject: [PATCH 1/2] Fix #123, update cmake_minimum_required Fixes the warning that support for old versions will be removed The build does not actually expect such an old version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b73b656..803ee01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 3.5) project(CFS_TO_LAB C) # Include source directory for table use From 8b0037442c579042f499bde17ca885299ae4825b Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 7 Jul 2022 09:59:05 -0400 Subject: [PATCH 2/2] Bump to v2.5.0-rc4+dev23 --- README.md | 4 ++++ fsw/src/to_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 84768eb..0cc9f24 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ To send telemetry to the "ground" or UDP/IP port, edit the subscription table in ## Version History +### Development Build: v2.5.0-rc4+dev23 +- Update cmake mimimum required to something more recent +- See + ### Development Build: v2.5.0-rc4+dev21 - Remove registration of empty EVS filters diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index 9cd2d90..79313f8 100644 --- a/fsw/src/to_lab_version.h +++ b/fsw/src/to_lab_version.h @@ -24,7 +24,7 @@ #define TO_LAB_VERSION_H /* Development Build Macro Definitions */ -#define TO_LAB_BUILD_NUMBER 21 /*!< Development Build: Number of commits since baseline */ +#define TO_LAB_BUILD_NUMBER 23 /*!< Development Build: Number of commits since baseline */ #define TO_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */