alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-15 19:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_issues' into 'master'

Browse Source 
CMake bugfixes

See merge request espressif/esp-idf!7605
This commit is contained in:
Angus Gratton
2020-03-06 14:36:59 +08:00
parent d6a2b4fdde a5d49d4db5
commit 2f1815f74e
5 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esptool_py/project_include.cmake
View File

@@ -226,7 +226,12 @@ $<JOIN:$<TARGET_PROPERTY:encrypted-${target_name},IMAGES>,\n>")
CONTENT "${flash_args_content}")
file(GENERATE OUTPUT "${build_dir}/encrypted_${target_name}_args"
INPUT "${CMAKE_CURRENT_BINARY_DIR}/encrypted_${target_name}_args.in")
else()
fail_target(encrypted-${target_name} "Error: The target encrypted-${target_name} requires"
"CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT to be enabled.")
endif()
endfunction()