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

2.4 Cherry Picks #4680

Closed
wants to merge 2 commits into from
Closed

2.4 Cherry Picks #4680

wants to merge 2 commits into from

Conversation

nibanks
Copy link
Member

@nibanks nibanks commented Dec 4, 2024

Cherry pick #4625 and #4574 to v2.4

redbaron and others added 2 commits December 4, 2024 13:19
…#4625)

Well managed CMake build environments make use of CMAKE_TOOLCHAIN_FILE
to configure build environment such as include/lib search paths,
system libraries, build flags, etc.

This change introduces QUIC_EXTERNAL_TOOLCHAIN build option, which
when enabled stops MSQuic CMake scripts from attempting to
do CMake toolchain job.

QUIC_EXTERNAL_TOOLCHAIN defaults to OFF to preserve original behaviour.
@nibanks nibanks requested a review from a team as a code owner December 4, 2024 13:20
@nibanks
Copy link
Member Author

nibanks commented Dec 4, 2024

@redbaron & @talregev could you please help here? I tried to quickly cherry-pick some changes to release/2.4 so they could be released, but it looks like I didn't grab enough. The CI is still failing. What am I missing?

@talregev
Copy link
Contributor

talregev commented Dec 4, 2024

@nibanks From my end I think you should do 3 cherry picks by this order:

I think you should only try one of us and do 2 PRs.

@talregev
Copy link
Contributor

talregev commented Dec 4, 2024

I will try to do a PR to release/2.4.

@talregev
Copy link
Contributor

talregev commented Dec 4, 2024

@nibanks
I create PR with the cherry picks and fix commit:
#4684

@talregev
Copy link
Contributor

talregev commented Dec 4, 2024

@nibanks
I create PR with both our changes and test on my github ci, and it working:
#4685

@nibanks nibanks closed this Dec 5, 2024
@nibanks nibanks deleted the 2.4-cps branch December 5, 2024 13:51
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