From 4352265fa0beeb5b8e2a975770891d31966d6e60 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 8 Nov 2019 11:56:13 +0800 Subject: [PATCH] cmake: Fix case error passing extra CMake args to sub-projects Bug in commit f4ea7c5a where the wrong variable case was used when passing through to sub-projects --- components/bootloader/project_include.cmake | 2 +- components/ulp/project_include.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bootloader/project_include.cmake b/components/bootloader/project_include.cmake index dffa4b963b..157ec3bb63 100644 --- a/components/bootloader/project_include.cmake +++ b/components/bootloader/project_include.cmake @@ -110,7 +110,7 @@ externalproject_add(bootloader # the bootloader common component requirements depends on this and # config variables are not available before project() call. -DLEGACY_INCLUDE_COMMON_HEADERS=${CONFIG_LEGACY_INCLUDE_COMMON_HEADERS} - ${EXTRA_CMAKE_ARGS} + ${extra_cmake_args} INSTALL_COMMAND "" BUILD_ALWAYS 1 # no easy way around this... BUILD_BYPRODUCTS ${bootloader_binary_files} diff --git a/components/ulp/project_include.cmake b/components/ulp/project_include.cmake index da44313362..e33ea2d503 100644 --- a/components/ulp/project_include.cmake +++ b/components/ulp/project_include.cmake @@ -48,7 +48,7 @@ function(ulp_embed_binary app_name s_sources exp_dep_srcs) -DIDF_PATH=${idf_path} -DSDKCONFIG=${SDKCONFIG_HEADER} -DPYTHON=${python} - ${EXTRA_CMAKE_ARGS} + ${extra_cmake_args} BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build BUILD_BYPRODUCTS ${ulp_artifacts} ${ulp_artifacts_extras} ${ulp_ps_sources} ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name} @@ -68,4 +68,4 @@ function(ulp_embed_binary app_name s_sources exp_dep_srcs) target_linker_script(${COMPONENT_LIB} INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name}.ld) target_add_binary_data(${COMPONENT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name}.bin BINARY) endif() -endfunction() \ No newline at end of file +endfunction()