Просмотр исходного кода

Merge branch 'bugfix/cmake_sdkconfig_path' into 'master'

fix bug for cmake build system

See merge request espressif/esp-idf!6052
Angus Gratton 6 лет назад
Родитель
Сommit
15e0ee528e
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      components/esp32/CMakeLists.txt

+ 2 - 1
components/esp32/CMakeLists.txt

@@ -1,3 +1,4 @@
+idf_build_get_property(sdkconfig_header SDKCONFIG_HEADER)
 if(BOOTLOADER_BUILD)
     # For bootloader, all we need from esp32 is headers
     idf_component_register(INCLUDE_DIRS include)
@@ -75,7 +76,7 @@ else()
     add_custom_command(
         OUTPUT esp32_out.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..."
         VERBATIM)