diff options
| author | Jean-François Milants <jf@codingfield.com> | 2023-12-17 16:51:44 +0100 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2023-12-23 21:29:13 +0100 |
| commit | e00b98b82c3f29fa963eef68ca9e097808982d6e (patch) | |
| tree | edbb3f600145d06b1d1e440b42b36e42afcdbcfe | |
| parent | 2bc93184511921abda938790a4bdd1d2ea8e06ce (diff) | |
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).
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c890870..c5d30874 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 |