alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_sdkconfig_path' into 'release/v4.0'

Browse Source 
fix bug for cmake build system

See merge request espressif/esp-idf!6102
This commit is contained in:
Angus Gratton 2019-09-16 14:20:38 +08:00
commit 5e0cc123ee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp32/CMakeLists.txt
View File

@ -1,3 +1,4 @@
idf_build_get_property(sdkconfig_header SDKCONFIG_HEADER)
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# For bootloader, all we need from esp32 is headers # For bootloader, all we need from esp32 is headers
idf_component_register(INCLUDE_DIRS include) idf_component_register(INCLUDE_DIRS include)
@ -75,7 +76,7 @@ else()
add_custom_command( add_custom_command(
OUTPUT esp32_out.ld OUTPUT esp32_out.ld
COMMAND "${CMAKE_C_COMPILER}" -C -P -x c -E -o esp32_out.ld -I ${config_dir} ${LD_DIR}/esp32.ld COMMAND "${CMAKE_C_COMPILER}" -C -P -x c -E -o esp32_out.ld -I ${config_dir} ${LD_DIR}/esp32.ld
MAIN_DEPENDENCY ${LD_DIR}/esp32.ld ${SDKCONFIG_H} MAIN_DEPENDENCY ${LD_DIR}/esp32.ld ${sdkconfig_header}
COMMENT "Generating linker script..." COMMENT "Generating linker script..."
VERBATIM) VERBATIM)