Merge IC:Caelum-rc4+dev12, to_lab v2.5.0-rc4+dev23

- update cmake_minimum_required - See <nasa/cFS#523>
thnkslprpt · Jul 8, 2022 · a6ab386 · a6ab386
2 parents 565d961 + 8b00374
commit a6ab386
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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

diff --git 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 <https://github.com/nasa/to_lab/pull/124>
+
 ### 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
@@ -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 */