espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: fix extra component dirs ordering

Browse Source
This commit is contained in:
Renz Christian Bagaporo
2020-02-20 12:31:23 +05:00
parent 6648127362
commit 9d0e3501c5
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()