Author: Jean-François Milants <jf@codingfield.com>
CMake User Applications selection Revert changes that need "return PROPAGATE" since this is not available in our Docker build (it needs CMake 3.25 and we have 3.22).
CMakeLists.txt | 4 ++--
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c890870922c3eccdb75f437bfee290ac68c1400..c5d30874dd2383ef3e39214386e87a44de1a5679 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(NRF_TARGET "nrf52") -cmake_policy(SET CMP0140 NEW) if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH) message(FATAL_ERROR "The path to the toolchain (arm-none-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>") @@ -87,7 +86,8 @@ function(AddToListIfEnabled list enabled type) if(${enabled}) list(APPEND ${list} ${type}) endif () - return(PROPAGATE ${list}) + #return(PROPAGATE ${list}) + set(${list} "${${list}}" PARENT_SCOPE) endfunction() # Generate the list of user apps to be compiled into the firmware