[Build] Removed gRPC_PROTOBUF_PACKAGE_TYPE, supporting config only #32988
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
veblush
added
lang/core
area/build
release notes: yes
veblush
changed the title
grpc-checks
bot
added
per-call-memory/neutral
per-channel-memory/neutral
bloat/none
labels
|
CC: @coryan |
coryan
reviewed
May 3, 2023
cmake/protobuf.cmake
Outdated
| @@ -90,6 +86,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") | |||
| set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE}) | |||
| endif() | |||
| endif() | |||
| set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf ${gRPC_PROTOBUF_PACKAGE_TYPE})\nendif()") | |||
| set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf CONFIG)\nendif()") | |||
There was a problem hiding this comment.
Unrelated, but this is going into gRPCConfig.cmake, you should use find_dependency() and not find_package() in those:
https://cmake.org/cmake/help/latest/module/CMakeFindDependencyMacro.html
https://stackoverflow.com/questions/50263280/difference-between-find-dependency-and-find-package-in-cmake
There was a problem hiding this comment.
Oh that's a good point. Thanks! Updated this and will update others too.
There was a problem hiding this comment.
You need to include(CMakeFindDependencyMacro) to use find_dependency. #33361
coryan
approved these changes
May 3, 2023
yashykt
approved these changes
May 4, 2023
veblush
added a commit
to veblush/grpc
that referenced
this pull request
May 4, 2023
…rpc#32988) `FindProtobuf` isn't working as Protobuf began to use Abseil so gRPC is now using `CONFIG` mode for protobuf module (Context: https://gitlab.kitware.com/cmake/cmake/-/issues/24321)
copybara-service
bot
added
the
imported
nanahpang
pushed a commit
to nanahpang/grpc
that referenced
this pull request
May 8, 2023
…rpc#32988) `FindProtobuf` isn't working as Protobuf began to use Abseil so gRPC is now using `CONFIG` mode for protobuf module (Context: https://gitlab.kitware.com/cmake/cmake/-/issues/24321)
wanlin31
pushed a commit
that referenced
this pull request
May 18, 2023
…32988) `FindProtobuf` isn't working as Protobuf began to use Abseil so gRPC is now using `CONFIG` mode for protobuf module (Context: https://gitlab.kitware.com/cmake/cmake/-/issues/24321)
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.
FindProtobufisn't working as Protobuf began to use Abseil so gRPC is now usingCONFIGmode for protobuf module(Context: https://gitlab.kitware.com/cmake/cmake/-/issues/24321)