cmake/zephyr: src/audio/CMakeLists.txt unification part 2 #9912
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_ARIA STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/aria_llext) | ||
| add_dependencies(app aria) | ||
| else() | ||
| add_local_sources(sof aria.c aria_hifi5.c aria_hifi3.c aria_generic.c) | ||
| endif() |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,19 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_DRC STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/drc_llext) | ||
| add_dependencies(app drc) | ||
| else() | ||
| add_local_sources(sof | ||
| drc.c | ||
| drc_generic.c | ||
| drc_hifi3.c | ||
| drc_hifi4.c | ||
| drc_math_generic.c | ||
| drc_math_hifi3.c | ||
| ) | ||
| endif() | ||
|
|
||
| if(NOT CONFIG_COMP_DRC STREQUAL "n") | ||
| add_local_sources(sof drc_log.c) | ||
| endif() |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_MFCC STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/mfcc_llext) | ||
| add_dependencies(app mfcc) | ||
| else() | ||
| add_local_sources(sof mfcc.c mfcc_setup.c mfcc_common.c mfcc_generic.c mfcc_hifi4.c mfcc_hifi3.c) | ||
| endif() |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,12 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_MIXIN_MIXOUT STREQUAL "m") | ||
|
|
||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/mixin_mixout_llext) | ||
| add_dependencies(app mixin_mixout) | ||
|
|
||
| else() | ||
|
|
||
| add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c mixin_mixout_hifi5.c) | ||
|
|
||
| endif() |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_MULTIBAND_DRC STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/multiband_drc_llext) | ||
| add_dependencies(app multiband_drc) | ||
| else() | ||
| add_local_sources(sof multiband_drc.c) | ||
| add_local_sources(sof multiband_drc_generic.c) | ||
|
|
||
| if(CONFIG_IPC_MAJOR_3) | ||
| add_local_sources(sof multiband_drc_ipc3.c) | ||
| elseif(CONFIG_IPC_MAJOR_4) | ||
| add_local_sources(sof multiband_drc_ipc4.c) | ||
| endif() | ||
| endif() |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_MUX STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/mux_llext) | ||
| add_dependencies(app mux) | ||
| else() | ||
| add_local_sources(sof mux.c mux_generic.c) | ||
|
|
||
| if(CONFIG_IPC_MAJOR_3) | ||
| add_local_sources(sof mux_ipc3.c) | ||
| elseif(CONFIG_IPC_MAJOR_4) | ||
| add_local_sources(sof mux_ipc4.c) | ||
| endif() | ||
| endif() | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,13 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_TDFB STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/tdfb_llext) | ||
| add_dependencies(app tdfb) | ||
|
Collaborator
There was a problem hiding this comment. why not
Collaborator
Author
There was a problem hiding this comment. @lyakh Ack, this might have been a return() case. I've used two approaches to convert src/audio/foo/ build rules:
I think this might have been better as a (2) case. |
||
| else() | ||
| add_local_sources(sof tdfb.c tdfb_generic.c tdfb_hifiep.c tdfb_hifi3.c tdfb_direction.c) | ||
| if(CONFIG_IPC_MAJOR_3) | ||
| add_local_sources(sof tdfb_ipc3.c) | ||
| elseif(CONFIG_IPC_MAJOR_4) | ||
| add_local_sources(sof tdfb_ipc4.c) | ||
| endif() | ||
| endif() | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,22 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_VOLUME STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/volume_llext) | ||
| add_dependencies(app volume) | ||
| else() | ||
| add_local_sources(sof | ||
| volume_generic.c | ||
| volume_hifi3.c | ||
| volume_hifi4.c | ||
| volume_hifi5.c | ||
| volume_generic_with_peakvol.c | ||
| volume_hifi3_with_peakvol.c | ||
| volume_hifi4_with_peakvol.c | ||
| volume_hifi5_with_peakvol.c | ||
| volume.c) | ||
| if(CONFIG_IPC_MAJOR_3) | ||
| add_local_sources(sof volume_ipc3.c) | ||
| elseif(CONFIG_IPC_MAJOR_4) | ||
| add_local_sources(sof volume_ipc4.c) | ||
| endif() | ||
| endif() |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(a general comment to an earlier discussion) I think optically I actually prefer TAB over "two spaces" indentation. And cmake shouldn't really go beyond 3 levels of indentation... So 8-space TABs shouldn't exceed maximum line length
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lyakh I'll redirect to https://github.com/orgs/thesofproject/discussions/9899 and note that even the "Mastering CMake" O'Reily book follows the 2-space indent ;)