espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix case error passing extra CMake args to sub-projects

Browse Source 
Bug in commit f4ea7c5a where the wrong variable case was used when passing
through to sub-projects
This commit is contained in:
Angus Gratton
2019-11-08 11:56:13 +08:00
committed by Angus Gratton
parent ba72de2099
commit 4352265fa0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader/project_include.cmake
View File

@@ -110,7 +110,7 @@ externalproject_add(bootloader
# the bootloader common component requirements depends on this and # the bootloader common component requirements depends on this and
# config variables are not available before project() call. # config variables are not available before project() call.
-DLEGACY_INCLUDE_COMMON_HEADERS=${CONFIG_LEGACY_INCLUDE_COMMON_HEADERS} -DLEGACY_INCLUDE_COMMON_HEADERS=${CONFIG_LEGACY_INCLUDE_COMMON_HEADERS}
${EXTRA_CMAKE_ARGS} ${extra_cmake_args}
INSTALL_COMMAND "" INSTALL_COMMAND ""
BUILD_ALWAYS 1 # no easy way around this... BUILD_ALWAYS 1 # no easy way around this...
BUILD_BYPRODUCTS ${bootloader_binary_files} BUILD_BYPRODUCTS ${bootloader_binary_files}

2
components/ulp/project_include.cmake
View File

@@ -48,7 +48,7 @@ function(ulp_embed_binary app_name s_sources exp_dep_srcs)
-DIDF_PATH=${idf_path} -DIDF_PATH=${idf_path}
-DSDKCONFIG=${SDKCONFIG_HEADER} -DSDKCONFIG=${SDKCONFIG_HEADER}
-DPYTHON=${python} -DPYTHON=${python}
${EXTRA_CMAKE_ARGS} ${extra_cmake_args}
BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build
BUILD_BYPRODUCTS ${ulp_artifacts} ${ulp_artifacts_extras} ${ulp_ps_sources} BUILD_BYPRODUCTS ${ulp_artifacts} ${ulp_artifacts_extras} ${ulp_ps_sources}
${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name} ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name}