GH-46084: [C++] Always use ARROW_VCPKG to detect vcpkg mode #46467
Conversation
This file contains hidden or 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
We can use `ARROW_DEPENDENCY_SOURCE=VCPKG` to use vcpkg for dependencies. We prepare vcpkg by `cpp/cmake_modules/UseVcpkg.cmake` and it always defines `ARROW_VCPKG`. The current code base has some ways to detect vcpkg mode: * `if (ARROW_PACKAGE_KIND STREQUAL "vcpkg")` * `if (VCPKG_TOOLCHAIN)` `ARROW_PACKAGE_KIND` is optional. `ARROW_DEPENDENCY_SOURCE=VCPKG` doesn't define `ARROW_PACKAGE_KIND=vcpkg` automatically. So either `ARROW_VCPKG` or `VCPKG_TOOLCHAIN` is better to detect vcpkg mode. This change uses `ARROW_VCPKG` for readability. If we accept vcpkg mode without `ARROW_DEPENDENCY_SOURCE=VCPKG`, `VCPKG_TOOLCHAIN` is better than `ARROW_VCPKG`.
|
@github-actions crossbow submit -g python -g cpp |
|
|
github-actions
bot
added
Component: C++
awaiting committer review
|
Revision: 4411272 Submitted crossbow builds: ursacomputing/crossbow @ actions-73dadde10f
|
|
+1 |
|
After merging your PR, Conbench analyzed the 4 benchmarking runs that have been run so far on merge-commit 1229ced. There were no benchmark performance regressions. 🎉 The full Conbench report has more details. |
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.
Rationale for this change
We can use
ARROW_DEPENDENCY_SOURCE=VCPKGto use vcpkg for dependencies. We prepare vcpkg bycpp/cmake_modules/UseVcpkg.cmakeand it always definesARROW_VCPKG.The current code base has some ways to detect vcpkg mode:
if (ARROW_PACKAGE_KIND STREQUAL "vcpkg")if (VCPKG_TOOLCHAIN)ARROW_PACKAGE_KINDis optional.ARROW_DEPENDENCY_SOURCE=VCPKGdoesn't defineARROW_PACKAGE_KIND=vcpkgautomatically.So either
ARROW_VCPKGorVCPKG_TOOLCHAINis better to detect vcpkg mode.What changes are included in this PR?
This change uses
ARROW_VCPKGfor readability. If we accept vcpkg mode withoutARROW_DEPENDENCY_SOURCE=VCPKG,VCPKG_TOOLCHAINis better thanARROW_VCPKG.Are these changes tested?
Yes.
Are there any user-facing changes?
Yes.