Merge IC:Caelum-rc4+dev12, ci_lab v2.5.0-rc4+dev24

- update cmake_minimum_required - see <nasa/cFS#523>
nasa · Jul 8, 2022 · c5aba5c · c5aba5c
2 parents 9a70ffa + 05ad755
commit c5aba5c
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_CI_LAB C)
 
 include_directories(fsw/mission_inc)

diff --git a/README.md b/README.md
@@ -12,6 +12,10 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac
 ## Changelog
 
 
+### Development Build: v2.5.0-rc4+dev24
+- Update cmake mimimum required to something more recent
+- See <https://github.com/nasa/ci_lab/pull/113>
+
 ### Development Build: v2.5.0-rc4+dev22
 
 - Remove registration of empty EVS filters

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 22 /*!< Development Build: Number of commits since baseline */
+#define CI_LAB_BUILD_NUMBER 24 /*!< 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 */