-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cmake: cleanup and simplify the standard include logic in Zephyr #64776
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zephyrbot
added
area: Build System
platform: Intel ADSP
Intel Audio platforms
platform: NXP
NXP
area: NIOS2
NIOS2 Architecture
area: Xtensa
Xtensa Architecture
labels
Nov 3, 2023
zephyrbot
requested review from
aborisovich,
ceolin,
dleach02,
jxstelter,
kv2019i,
lgirdwood,
lyakh,
marc-hb,
marcinszkudlinski,
mmahadevan108,
softwarecki and
tmleman
November 3, 2023 13:13
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 3, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 3, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 3, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Several paths are checked for existence before added as global Zephyr include path. The existence check was needed because some tooling emit warnings on non-existing paths. Only few SoCs are using those pre-defined paths, yet this code runs for all SoCs. The principle originates back from Kbuild days, and with CMake it's more common and generally more visible to let the CMake code defining libraries to specify include paths. Furthermore it appears that several SoC implementation following the <soc-path>/include was unaware that the path would be automatically added as include path, cause they contain lines like: zephyr_library_include_directories(include) Remove pre-defineds path except the `<SOC_PATH>` path, which is guaranteed to exists. This simplifies the CMake logic in the top-level Zephyr CMakeLists.txt file. This cleanup further prepares for future work where SoCs need not to be organised under architectures which is important for multi-arch SoCs. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
force-pushed
the
cleanup_include_paths
branch
from
November 3, 2023 15:38
69c7fde
to
2e9ca81
Compare
dcpleung
approved these changes
Nov 3, 2023
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 6, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
andyross
approved these changes
Nov 6, 2023
nashif
approved these changes
Nov 6, 2023
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 7, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 13, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 13, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 13, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 16, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 16, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 16, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 16, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 16, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 20, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 21, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 28, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 28, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 28, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 28, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 29, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Nov 29, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Dec 1, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Dec 1, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Dec 1, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
added a commit
to tejlmand/zephyr
that referenced
this pull request
Dec 4, 2023
Local temporary commit, to be updated when zephyrproject-rtos#64776 has been merged. For now, keep independent commit. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area: Build System
area: NIOS2
NIOS2 Architecture
area: Xtensa
Xtensa Architecture
platform: Intel ADSP
Intel Audio platforms
platform: NXP
NXP
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Several paths are checked for existence before added as global Zephyr include path.
The existence check was needed because some tooling emit warnings on non-existing paths.
Only few SoCs are using those pre-defined paths, yet this code runs for all SoCs. The principle originates back from Kbuild days, and with CMake it's more common and generally more visible to let the CMake code defining libraries to specify include paths.
Furthermore it appears that several SoC implementation following the
<soc-path>/include
was unaware that the path would be automatically added as include path, cause they contain lines like:Remove pre-defineds path except the
<SOC_PATH>
path, which is guaranteed to exists.This simplifies the CMake logic in the top-level Zephyr CMakeLists.txt file.
This cleanup further prepares for future work where SoCs need not to be organised under architectures which is important for multi-arch SoCs.