espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_extra_component_dirs_ordering_v3.3' into 'release/v3.3'

Browse Source 
cmake: fix extra component dirs ordering (v3.3)

See merge request espressif/esp-idf!7730
This commit is contained in:
Angus Gratton
2020-03-09 13:55:04 +08:00
parent 6f9a7264ce 9d0e3501c5
commit 46c8f40a83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/cmake/project.cmake
View File

@ -30,6 +30,12 @@ macro(project name)
endforeach() endforeach()
endif() endif()
if(NOT MAIN_SRCS)
list(APPEND IDF_EXTRA_COMPONENT_DIRS "${CMAKE_SOURCE_DIR}/main")
endif()
list(APPEND IDF_EXTRA_COMPONENT_DIRS "${CMAKE_SOURCE_DIR}/components")
if(EXTRA_COMPONENT_DIRS) if(EXTRA_COMPONENT_DIRS)
spaces2list(EXTRA_COMPONENT_DIRS) spaces2list(EXTRA_COMPONENT_DIRS)
@ -39,12 +45,6 @@ macro(project name)
endforeach() endforeach()
endif() endif()
list(APPEND IDF_EXTRA_COMPONENT_DIRS "${CMAKE_SOURCE_DIR}/components")
if(NOT MAIN_SRCS)
list(APPEND IDF_EXTRA_COMPONENT_DIRS "${CMAKE_SOURCE_DIR}/main")
endif()
if(COMPONENTS) if(COMPONENTS)
set(IDF_COMPONENTS "${COMPONENTS}") set(IDF_COMPONENTS "${COMPONENTS}")
endif() endif()