set gRPC_PROTOBUF_PACKAGE_TYPE=CONFIG when installing and building grpc to ensure grpc finds protobuf with the CONFIG mode and the libprotobuf TYPE property is set

Author: dbarker

CMakeLists.txt

@@ -359,6 +359,7 @@ if(WITH_OTLP_GRPC
   endif()
 
   include("${opentelemetry-cpp_SOURCE_DIR}/cmake/protobuf.cmake")
+
   include("${opentelemetry-cpp_SOURCE_DIR}/cmake/opentelemetry-proto.cmake")
 endif()
 
@@ -584,10 +585,13 @@ if(opentelemetry-proto_VERSION)
   )
 endif()
 if(Protobuf_VERSION)
-  message(STATUS "Protobuf: ${Protobuf_VERSION} (${Protobuf_PROVIDER})")
+  message(
+    STATUS
+      "Protobuf: ${Protobuf_VERSION} (${Protobuf_PROVIDER} - ${protobuf_lib_type})"
+  )
 endif()
 if(gRPC_VERSION)
-  message(STATUS "gRPC: ${gRPC_VERSION} (${gRPC_PROVIDER})")
+  message(STATUS "gRPC: ${gRPC_VERSION} (${gRPC_PROVIDER} - ${grpc_lib_type})")
 endif()
 if(CURL_VERSION)
   message(STATUS "CURL: ${CURL_VERSION} (${CURL_PROVIDER})")

cmake/grpc.cmake

@@ -41,6 +41,7 @@ if(NOT gRPC_FOUND)
   set(gRPC_RE2_PROVIDER "module"  CACHE STRING "" FORCE)
   set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
   set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "" FORCE)
+  set(gRPC_PROTOBUF_PACKAGE_TYPE "CONFIG" CACHE STRING "" FORCE)
   set(gRPC_ABSL_PROVIDER "module" CACHE STRING "" FORCE)
   set(gRPC_CARES_PROVIDER "module" CACHE STRING "" FORCE)
 
@@ -56,14 +57,15 @@ if(NOT gRPC_FOUND)
                                                       CXX_CLANG_TIDY "")
     endif()
   endforeach()
-endif()
 
-if(TARGET grpc++ AND NOT TARGET gRPC::grpc++)
-  add_library(gRPC::grpc++ ALIAS grpc++)
-endif()
+  if(TARGET grpc++ AND NOT TARGET gRPC::grpc++)
+    add_library(gRPC::grpc++ ALIAS grpc++)
+  endif()
+
+  if(TARGET grpc_cpp_plugin AND NOT TARGET gRPC::grpc_cpp_plugin)
+    add_executable(gRPC::grpc_cpp_plugin ALIAS grpc_cpp_plugin)
+  endif()
 
-if(TARGET grpc_cpp_plugin AND NOT TARGET gRPC::grpc_cpp_plugin)
-  add_executable(gRPC::grpc_cpp_plugin ALIAS grpc_cpp_plugin)
 endif()
 
 if(NOT TARGET gRPC::grpc++)

cmake/protobuf.cmake

@@ -49,11 +49,12 @@ else()
 
     # Set the Protobuf_VERSION variable from the git tag.
     string(REGEX REPLACE "^v([0-9]+\\.[0-9]+\\.[0-9]+)$" "\\1" Protobuf_VERSION "${protobuf_GIT_TAG}")
-  endif()
-endif()
 
-if(TARGET libprotobuf)
-  set_target_properties(libprotobuf PROPERTIES POSITION_INDEPENDENT_CODE ON CXX_CLANG_TIDY "" CXX_INCLUDE_WHAT_YOU_USE "")
+    if(TARGET libprotobuf)
+      set_target_properties(libprotobuf PROPERTIES POSITION_INDEPENDENT_CODE ON CXX_CLANG_TIDY "" CXX_INCLUDE_WHAT_YOU_USE "")
+    endif()
+
+  endif()
 endif()
 
 if(NOT TARGET protobuf::libprotobuf)

install/cmake/CMakeLists.txt

@@ -232,6 +232,7 @@ if(grpc IN_LIST _THIRDPARTY_PACKAGE_LIST)
                "-DRE2_BUILD_TESTING=OFF"
                "-DgRPC_ZLIB_PROVIDER=package"
                "-DgRPC_PROTOBUF_PROVIDER=package"
+               "-DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG"
                "-DgRPC_ABSL_PROVIDER=package")
 
   add_dependencies(grpc-build zlib-install abseil-install protobuf-install)