[vcpkg-cmake] Remove cmake generator support restrictions #22626
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
CMake already completed configuration using the given generator.
* `vcpkg_cmake_configure`: links to `opencv4` as example instead of `opencv` which is an empty port * `vcpkg_cmake_install`: fix link to `vcpkg_cmake_build`'s docs * `vcpkg_cmake_build`: fix link to `vcpkg_cmake_install`'s docs
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Closed
PhoebeHui
added
the
category:tool-update
* no/parallel_args when CMake Generator is "Xcode"
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/vcpkg-cmake/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
JackBoosY
approved these changes
Jan 22, 2022
|
LGTM. |
ras0219-msft
approved these changes
Jan 25, 2022
It would be nicely complemented by |
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.
Describe the pull request
What does your PR fix?
Removes generator restrictions from
vcpkg_cmake_build. When arriving in this function, the generator was already used successfully for build system generation, so there is no reaon for failing here. There is still a point in printing a warning if we don't how to control the build tool (verbosity, parallelism). Resolves VCPKG forcing Ninja #22368 if using the maintainer functions from portvcpkg-cmake. Fixes building packages which assume themakebuild tool, e.g. by using$(MAKE)for recursive invocations.Rectifies the configure command mentioned in that message.
Adds
Unix Makefilessupport. (Tested locally with libwebsockets:x64-linux. Total port build time is equal to Ninja, app. 20 s.)Integrates the documentation update from [document] Doc fixes for utils in vcpkg-cmake port #21763.
Adds
Xcodesupport by @luncliff, cherry-picked from [vcpkg-cmake] support Xcode parallel build #22631.Which triplets are supported/not supported? Have you updated the CI baseline?
all, no
(No effort is made to acquire
makefor windows. I assumecmakewill already complain in the configure step if cannot find the build tool.)Does your PR follow the maintainer guide?
yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?yes