[vcpkg-tool] Add a cmake preset for boostrap-vcpkg.sh #1380
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
SchaichAlonso
force-pushed
the
37958-cmake-preset-for-bootstrap.sh
branch
from
ce0bd28 to
54723b2
Compare
|
Seems reasonable, thanks :) |
SchaichAlonso
added a commit
to PurpleFlowerGarden/vcpkg
that referenced
this pull request
Nov 6, 2024
There's a [string escaping madness in bootstrap.sh's cmake invokation around line 217, making the script difficult to maintain. I broke it before in PR microsoft#36828 which went into master undetected as it "worked over here" (tm) and isn't executed by the CI, but appearently it wouldn't work on arch linux' bash, resulting in PR microsoft#37047 . microsoft/vcpkg-tool#1380 introduces a CMake Preset that can take over the cmake CLI variable setup. This commit replaces the nested string composition by it's cmake-preset counterpart.
SchaichAlonso
added a commit
to PurpleFlowerGarden/vcpkg
that referenced
this pull request
Nov 6, 2024
There's a [string escaping madness in bootstrap.sh's cmake invokation around line 217, making the script difficult to maintain. I broke it before in PR microsoft#36828 which went into master undetected as it "worked over here" (tm) and isn't executed by the CI, but appearently it wouldn't work on arch linux' bash, resulting in PR microsoft#37047 . microsoft/vcpkg-tool#1380 introduces a CMake Preset that can take over the cmake CLI variable setup. This commit replaces the nested string composition by it's cmake-preset counterpart.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
scripts/bootrap.sh does some rather interesting composition of a cmake call around lines 214 which results in having to use
evalto get rid of the double-escaping of some strings.Further, the ninja-specific multi-task build job rules are quite nasty and probably don't provide us with anything that passing
--paralleltocmake --buildcould also do.Add a CMakePreset.json representing the cmake invokation of
bootstrap.sh, and replace the ninja specific code by--build- or - if the ninja specialization has to stay, derive a ninja multi-tasking preset from the regular, which allows simplifying the bootstrap script, as well as invoking cmake in a vcpkg-tool checkout.Fixes: microsoft/vcpkg#37958