Skip to content
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

Preparation for zephyr/cmake/math transfer #8494

Merged
merged 4 commits into from
Nov 29, 2023

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Nov 18, 2023

CMake deduplication #8260

No migration yet, just splitting the change in two to minimize review strain.

@lyakh
Copy link
Collaborator

lyakh commented Nov 20, 2023

@marc-hb all these changes look nice so far, but at least to a non-cmake-expert like myself it would be helpful to see at least approximately "where this all is going?" Either as a draft PR or as a comment in #8260 - just to see how this is all going to be used

@marc-hb
Copy link
Collaborator Author

marc-hb commented Nov 20, 2023

"where this all is going?

See:

There is nothing "smart" or complicated about #8260, I'm really just moving scattering CMake code away from zephyr/CMakeLists.txt into subdirectories. Anything more elaborate I should do?

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor questions.

scripts/cmake/misc.cmake Show resolved Hide resolved
@@ -128,6 +128,20 @@ macro(is_zephyr ret)
endif()
endmacro()

# Wrappers for re-using existing, XTOS CMake files. Do NOT use in Zephyr-specific code.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment might be confusing as its in the zephyr makefile ?

Fixes commit 1bd9e0d ("cmake/zephyr: decentralize src/ipc/")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
For reducing CMake duplication and centralization, see thesofproject#8260

Not used yet.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Leverage the previous commit.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This makes the code shorter and will help with thesofproject#8260

Zero functional change.

Do not use it when Zephyr use is not conditional.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Copy link
Contributor

@andyross andyross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This scheme is looking very clean (especially given the difficulties of the source language, I guess "macro" was the magic), nice.

@lgirdwood lgirdwood merged commit 2ce1f9e into thesofproject:main Nov 29, 2023
42 of 43 checks passed
@marc-hb marc-hb deleted the cmake-math-prework branch November 29, 2023 23:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants