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.

Sign up for GitHub

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

Jump to bottom

Fix picotool_DIR and pioasm_DIR passing to universal build #534

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Fix picotool_DIR and pioasm_DIR passing to universal build #534

merged 2 commits into from
Sep 5, 2024

Conversation

will-v-pi
Copy link
Contributor

If pictool_DIR is set then pass that, otherwise pass the picotool_INSTALL_DIR, which is only set when picotool is built as part of the SDK

Fixes #531 I think - although @lurch should probably double check

@will-v-pi will-v-pi requested a review from lurch August 27, 2024 09:09
@lurch
Copy link
Contributor

lurch commented Aug 27, 2024 •
edited
Loading

Yup, I can confirm this fixes #531 thanks!

lurch
lurch reviewed Aug 27, 2024
View reviewed changes
universal/CMakeLists.txt Outdated Show resolved Hide resolved
@lurch lurch changed the title Fix picotool_DIR passing to universal build Fix picotool_DIR and pioasm_DIR passing to universal build Aug 28, 2024
@will-v-pi will-v-pi merged commit 40d2476 into raspberrypi:develop Sep 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lurch lurch lurch left review comments

@kilograham kilograham kilograham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@will-v-pi @lurch @kilograham