From 42d4f39a9a57e1f7d312dc80610c39bedf615187 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Mon, 28 Oct 2019 15:32:08 +0800 Subject: [PATCH] cmake: consider sdkconfig defaults value from environment --- tools/cmake/project.cmake | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/cmake/project.cmake b/tools/cmake/project.cmake index e96dccc4ff..d5a7254aa4 100644 --- a/tools/cmake/project.cmake +++ b/tools/cmake/project.cmake @@ -313,22 +313,28 @@ macro(project project_name) # PROJECT_NAME is taken from the passed name from project() call # PROJECT_DIR is set to the current directory # PROJECT_VER is from the version text or git revision of the current repo - if(SDKCONFIG_DEFAULTS) - foreach(sdkconfig_default ${SDKCONFIG_DEFAULTS}) - get_filename_component(sdkconfig_default "${sdkconfig_default}" ABSOLUTE) - if(NOT EXISTS "${sdkconfig_default}") - message(FATAL_ERROR "SDKCONFIG_DEFAULTS '${sdkconfig_default}' does not exist.") - endif() - list(APPEND sdkconfig_defaults ${sdkconfig_default}) - endforeach() - else() + set(_sdkconfig_defaults "$ENV{SDKCONFIG_DEFAULTS}") + + if(NOT _sdkconfig_defaults) if(EXISTS "${CMAKE_SOURCE_DIR}/sdkconfig.defaults") - set(sdkconfig_defaults "${CMAKE_SOURCE_DIR}/sdkconfig.defaults") + set(_sdkconfig_defaults "${CMAKE_SOURCE_DIR}/sdkconfig.defaults") else() - set(sdkconfig_defaults "") + set(_sdkconfig_defaults "") endif() endif() + if(SDKCONFIG_DEFAULTS) + set(_sdkconfig_defaults "${SDKCONFIG_DEFAULTS}") + endif() + + foreach(sdkconfig_default ${_sdkconfig_defaults}) + get_filename_component(sdkconfig_default "${sdkconfig_default}" ABSOLUTE) + if(NOT EXISTS "${sdkconfig_default}") + message(FATAL_ERROR "SDKCONFIG_DEFAULTS '${sdkconfig_default}' does not exist.") + endif() + list(APPEND sdkconfig_defaults ${sdkconfig_default}) + endforeach() + if(SDKCONFIG) get_filename_component(sdkconfig "${SDKCONFIG}" ABSOLUTE) else()