pinetime/InfiniTime
1
0
Fork 0
Code Activity

CMake User Applications selection

Browse source 
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).
This commit is contained in:
Jean-François Milants 2023-12-17 16:51:44 +01:00 committed by JF
parent 2bc9318451
commit e00b98b82c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -14,7 +14,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(NRF_TARGET "nrf52") set(NRF_TARGET "nrf52")
cmake_policy(SET CMP0140 NEW)
if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH) 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>") 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}) if(${enabled})
list(APPEND ${list} ${type}) list(APPEND ${list} ${type})
endif () endif ()
return(PROPAGATE ${list}) #return(PROPAGATE ${list})
set(${list} "${${list}}" PARENT_SCOPE)
endfunction() endfunction()
# Generate the list of user apps to be compiled into the firmware # Generate the list of user apps to be compiled into the firmware