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

[vcpkg] X_VCPKG_APPINSTALL_DEPS_INSTALL optionally install dependencies on install #14243

Merged
merged 3 commits into from
Nov 20, 2020

Conversation

sandercox
Copy link
Contributor

Continuing on the work from #14129 #13011 this adds an install command override again as proposed initially but behind an if check for the variable X_VCPKG_APPLOCAL_DEPS_INSTALL marking it as experimental and allowing the feature to just work as I initially intended.

I was already using the install function as used here in my own projects but I think this allows everybody to really use the functionality introduced by the x_vcpkg_install_local_dependencies function.

As originally requested in #1653

Copy link
Contributor

@Shatur Shatur left a comment

Choose a reason for hiding this comment

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

Works as expected for me with install command and CPack.
One small suggestion: you don't need to expand variables in if expressions, this will be done automatically. Elsewhere in this file, the same approach is used, so it's best to do the same for consistency. :) I also tested with this changes, everything works fine for me.

scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved
@PhoebeHui PhoebeHui added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Oct 27, 2020
sandercox and others added 2 commits October 27, 2020 14:08
Use variables directly instead of prefixing with `${}` as is done in rest of the file. Thanks @shatur95

Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com>
Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com>
@JackBoosY
Copy link
Contributor

cc @BillyONeal for review this PR.

@strega-nil
Copy link
Contributor

strega-nil commented Nov 20, 2020

Given that this is an experimental feature, I'm up for merging it, with the understanding that this very well may be removed or modified, especially as we get closer to stabilization :)

Thanks @sandercox for your contribution~!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants