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.

Sign up for GitHub

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

GH-43416: [CI] Upgrade our vcpkg version on .env #43417

Closed
wants to merge 7 commits into from
Closed

GH-43416: [CI] Upgrade our vcpkg version on .env #43417

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c59106
GH-43416: [CI] Upgrade our vcpkg version on .env
raulcd Jul 25, 2024
e20f903
Fix patches
raulcd Jul 25, 2024
8880226
Apply orc patch in order to make CMake happy
raulcd Jul 26, 2024
dce3329
Add license to patch file
raulcd Jul 26, 2024
4d155c8
Make Windows happy with the patch
raulcd Jul 26, 2024
a0e017f
Update patch
raulcd Jul 29, 2024
e939b3d
New snippet to fix orc
raulcd Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update patch
  • Loading branch information
@raulcd
raulcd committed Aug 27, 2024
commit a0e017fded71c37ac635dbcac296a2736800db3f
4 changes: 2 additions & 2 deletions cpp/cmake_modules/orc.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ index aa520ff..01ab294 100644
if (ORC_PACKAGE_KIND STREQUAL "conan")
target_link_libraries (orc_protobuf INTERFACE ${protobuf_LIBRARIES})
-elseif (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB})
+elseif (ORC_PREFER_STATIC_PROTOBUF AND DEFINED PROTOBUF_STATIC_LIB)
+elseif (ORC_PREFER_STATIC_PROTOBUF AND PROTOBUF_STATIC_LIB)
target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB})
else ()
target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY})
Expand All @@ -33,7 +33,7 @@ index aa520ff..01ab294 100644

if (NOT ORC_PACKAGE_KIND STREQUAL "conan")
- if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB})
+ if (ORC_PREFER_STATIC_PROTOBUF AND DEFINED PROTOC_STATIC_LIB)
+ if (ORC_PREFER_STATIC_PROTOBUF AND PROTOC_STATIC_LIB)
target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB})
else ()
target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY})