Swapped the ZIP_LISTS implementation for a plain CMake one, to allow builds on older CMake versions. Also only now halting the build if SOFTDEVICE_PRESENT is asserted with any value and DEVICE_BLE is not 1, and would therefore be an invalid, unbootable configuration

Author: JohnVidler

CMakeLists.txt

@@ -3,11 +3,22 @@ project(codal-microbit-v2)
 # Actually merge our multiple configs into a single set of values so we can query them easily.
 # Note: This will be removed when we move to a library-ified version of the build system
 #       so do not rely on it for anything.
-foreach( _key _val IN ZIP_LISTS FINAL_FIELDS FINAL_VALUES )
+#
+# Note: This form of loop isn't available until we move to at least CMake 3.17+, so the second form
+#       below has been added to do the same, in a more verbose way.
+#foreach( _key _val IN ZIP_LISTS FINAL_FIELDS FINAL_VALUES )
+#    set( "__merged.config.${_key}" "${_val}" )
+#endforeach()
+
+LIST( LENGTH FINAL_FIELDS _idxMax )
+MATH( EXPR _idxMax "${_idxMax} - 1" )
+foreach( _index RANGE ${_idxMax} )
+    LIST( GET FINAL_FIELDS ${_index} _key )
+    LIST( GET FINAL_VALUES ${_index} _val )
     set( "__merged.config.${_key}" "${_val}" )
 endforeach()
 
-if( DEFINED __merged.config.SOFTDEVICE_PRESENT )
+if( DEFINED __merged.config.SOFTDEVICE_PRESENT AND NOT "${__merged.config.DEVICE_BLE}" STREQUAL "1" )
     message( FATAL_ERROR "Do not define SOFTDEVICE_PRESENT in your configuration, use DEVICE_BLE instead." )
 endif()