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

cmake: project includes should know about ESP_PLATFORM variable

Browse Source
This commit is contained in:
Renz Christian Bagaporo 2019-05-20 15:07:15 +08:00
parent e3eb945fd2
commit e1726a91ce
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -62,9 +62,6 @@ elseif(CONFIG_STACK_CHECK_ALL)
list(APPEND compile_options "-fstack-protector-all") list(APPEND compile_options "-fstack-protector-all")
endif() endif()
# All targets built under this scope is with the ESP-IDF build system
set(ESP_PLATFORM 1)
list(APPEND compile_definitions "-DESP_PLATFORM")
idf_build_set_property(COMPILE_OPTIONS "${compile_options}" APPEND) idf_build_set_property(COMPILE_OPTIONS "${compile_options}" APPEND)
idf_build_set_property(C_COMPILE_OPTIONS "${c_compile_options}" APPEND) idf_build_set_property(C_COMPILE_OPTIONS "${c_compile_options}" APPEND)

6
tools/cmake/build.cmake
View File

@ -443,12 +443,18 @@ macro(idf_build_process target)
idf_build_set_property(___COMPONENT_REQUIRES_COMMON ${lib} APPEND) idf_build_set_property(___COMPONENT_REQUIRES_COMMON ${lib} APPEND)
endforeach() endforeach()
# All targets built under this scope is with the ESP-IDF build system
set(ESP_PLATFORM 1)
idf_build_set_property(COMPILE_DEFINITIONS "-DESP_PLATFORM" APPEND)
__build_process_project_includes() __build_process_project_includes()
# Perform component processing (inclusion of project_include.cmake, adding component # Perform component processing (inclusion of project_include.cmake, adding component
# subdirectories, creating library targets, linking libraries, etc.) # subdirectories, creating library targets, linking libraries, etc.)
idf_build_get_property(idf_path IDF_PATH) idf_build_get_property(idf_path IDF_PATH)
add_subdirectory(${idf_path} ${build_dir}/esp-idf) add_subdirectory(${idf_path} ${build_dir}/esp-idf)
unset(ESP_PLATFORM)
endmacro() endmacro()
# idf_build_executable # idf_build_executable