Merge IC:Caelum-rc4+dev12, osal v6.0.0-rc4+dev93

- update cmake_minimum_required
- OSAL loader unit test builds hardcoded 32 modules, test fails if more modules are supported
- See <nasa/cFS#523>

CMakeLists.txt

@@ -40,7 +40,7 @@
 # OSAL resources.
 #
 ######################################################################
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 project(OSAL C)
 
 # The "OSAL_EXT_SOURCE_DIR" cache variable may be set to a path

README.md

@@ -11,6 +11,11 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Changelog
 
+### Development Build: v6.0.0-rc4+dev93
+- Update cmake mimimum required to something more recent (or remove)
+- Set OSAL Loader unit test number of modules to OSAL_CONFIG_MAX_MODULES
+- See <https://github.com/nasa/osal/pull/1267> and <https://github.com/nasa/osal/pull/1265>
+
 ### Development Build: v6.0.0-rc4+dev87
 
 - Add OS_StatusToString API

src/os/inc/osapi-version.h

@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   87
+#define OS_BUILD_NUMBER   93
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

src/unit-test-coverage/CMakeLists.txt

@@ -15,7 +15,6 @@
 #  NO ARTEFACTS FROM THIS BUILD SHOULD EVER INTERMINGLE WITH THE REAL TARGET BUILD
 #
 
-cmake_minimum_required(VERSION 2.6.4)
 project(OSALCOVERAGE C)
 
 # Ask to generate a "make test" target

src/unit-tests/osloader-test/CMakeLists.txt

@@ -9,8 +9,9 @@ add_osal_ut_exe(osal_loader_UT ${TEST_MODULE_FILES})
 
 # build many copies of the test module
 # we need to have unique modules to load up to OS_MAX_MODULES
-# This will cover up to 32 -- extras are ignored.  If needed this can be increased.
-set(MOD 32)
+# This will cover up to $OSAL_CONFIG_MAX_MODULES + 1.  If needed
+# this can be increased by increasing $OSAL_CONFIG_MAX_MODULES.
+math(EXPR MOD "${OSAL_CONFIG_MAX_MODULES} + 1")
 while(MOD GREATER 0)
   math(EXPR MOD "${MOD} - 1")
   add_library(MODULE${MOD} SHARED ut_module.c)