Commit 1229ced
authored
### Rationale for this change
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.
### What changes are included in this PR?
This change uses `ARROW_VCPKG` for readability. If we accept vcpkg mode without `ARROW_DEPENDENCY_SOURCE=VCPKG`, `VCPKG_TOOLCHAIN` is better than `ARROW_VCPKG`.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
Yes.
* GitHub Issue: #46084
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 8a2ff7c commit 1229ced
File tree
3 files changed
+5
-5
lines changed- cpp/cmake_modules
3 files changed
+5
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2913 | 2913 | | |
2914 | 2914 | | |
2915 | 2915 | | |
2916 | | - | |
| 2916 | + | |
2917 | 2917 | | |
2918 | 2918 | | |
2919 | 2919 | | |
| |||
0 commit comments