kopia lustrzana https://github.com/espressif/esp-idf
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
pull/4345/head
rodzic
ba72de2099
commit
4352265fa0
|
@ -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}
|
||||||
|
|
|
@ -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}
|
||||||
|
@ -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_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)
|
target_add_binary_data(${COMPONENT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name}.bin BINARY)
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
Ładowanie…
Reference in New Issue