GH-41333: [C++][CMake] Prefer protobuf-config.cmake to FindProtobuf.cmake #41360
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
|
@github-actions crossbow submit -g cpp -g python -g r |
|
|
github-actions
bot
added
Component: C++
awaiting committer review
This comment was marked as outdated.
This comment was marked as outdated.
kou
force-pushed
the
cpp-cmake-protobuf-config
branch
from
17ecdd1
to
53157c0
Compare
|
@github-actions crossbow submit -g cpp -g python -g r |
|
Revision: 53157c0 Submitted crossbow builds: ursacomputing/crossbow @ actions-6323df8a9c
|
|
Thanks @kou I was trying something similar on Conda: diff --git a/cpp/cmake_modules/FindProtobufAlt.cmake b/cpp/cmake_modules/FindProtobufAlt.cmake
index 15fe1b4..71a4a1c 100644
--- a/cpp/cmake_modules/FindProtobufAlt.cmake
+++ b/cpp/cmake_modules/FindProtobufAlt.cmake
@@ -28,9 +28,19 @@ endif()
if(ProtobufAlt_FIND_QUIETLY)
list(APPEND find_package_args QUIET)
endif()
-find_package(Protobuf ${find_package_args})
-set(ProtobufAlt_FOUND ${Protobuf_FOUND})
-if(ProtobufAlt_FOUND)
+find_package(protobuf CONFIG ${find_package_args})
+set(ProtobufAlt_FOUND ${protobuf_FOUND})
+if(NOT ProtobufAlt_FOUND)
+ find_package(Protobuf ${find_package_args})
+ set(ProtobufAlt_FOUND ${Protobuf_FOUND})
+endif()
+if(protobuf_FOUND)
+ set(ProtobufAlt_VERSION ${protobuf_VERSION})
+ set(ProtobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR})
+ set(ProtobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR})
+ set(ProtobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH})
+ set(ProtobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK})
+elseif(Protobuf_FOUND)
set(ProtobufAlt_VERSION ${Protobuf_VERSION})
set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})edit with correct patch |
raulcd
approved these changes
Apr 25, 2024
github-actions
bot
added
awaiting merge
|
@github-actions crossbow submit verify-rc-source-cpp-macos-arm64 |
|
Revision: 53157c0 Submitted crossbow builds: ursacomputing/crossbow @ actions-5614ccecdd
|
|
After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 64be7a2. There were 5 benchmark results indicating a performance regression:
The full Conbench report has more details. It also includes information about 3 possible false positives for unstable benchmarks that are known to sometimes produce them. |
raulcd
pushed a commit
that referenced
this pull request
Apr 29, 2024
…make (#41360) ### Rationale for this change `protobuf::libprotobuf` provided by `FindProtobuf.cmake` (provided by CMake) may not provide needed dependencies such as Abseil. ### What changes are included in this PR? Try `protobuf-config.cmake` provided by Protobuf before `FindProtobuf.cmake`. `protobuf::libprotobuf` provided by `protobuf-config.cmake` must have needed dependencies. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #41333 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
tolleybot
pushed a commit
to tmct/arrow
that referenced
this pull request
May 2, 2024
…obuf.cmake (apache#41360) ### Rationale for this change `protobuf::libprotobuf` provided by `FindProtobuf.cmake` (provided by CMake) may not provide needed dependencies such as Abseil. ### What changes are included in this PR? Try `protobuf-config.cmake` provided by Protobuf before `FindProtobuf.cmake`. `protobuf::libprotobuf` provided by `protobuf-config.cmake` must have needed dependencies. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: apache#41333 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
vibhatha
pushed a commit
to vibhatha/arrow
that referenced
this pull request
May 25, 2024
…obuf.cmake (apache#41360) ### Rationale for this change `protobuf::libprotobuf` provided by `FindProtobuf.cmake` (provided by CMake) may not provide needed dependencies such as Abseil. ### What changes are included in this PR? Try `protobuf-config.cmake` provided by Protobuf before `FindProtobuf.cmake`. `protobuf::libprotobuf` provided by `protobuf-config.cmake` must have needed dependencies. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: apache#41333 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
CurtHagenlocher
pushed a commit
to CurtHagenlocher/arrow
that referenced
this pull request
Jun 14, 2024
…obuf.cmake (apache#41360) ### Rationale for this change `protobuf::libprotobuf` provided by `FindProtobuf.cmake` (provided by CMake) may not provide needed dependencies such as Abseil. ### What changes are included in this PR? Try `protobuf-config.cmake` provided by Protobuf before `FindProtobuf.cmake`. `protobuf::libprotobuf` provided by `protobuf-config.cmake` must have needed dependencies. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: apache#41333 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
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
protobuf::libprotobufprovided byFindProtobuf.cmake(provided by CMake) may not provide needed dependencies such as Abseil.What changes are included in this PR?
Try
protobuf-config.cmakeprovided by Protobuf beforeFindProtobuf.cmake.protobuf::libprotobufprovided byprotobuf-config.cmakemust have needed dependencies.Are these changes tested?
Yes.
Are there any user-facing changes?
Yes.