fix review + conan

Author: RayeS2070

cmake/SetupProtobuf.cmake

@@ -41,7 +41,7 @@ if(NOT USERVER_FORCE_DOWNLOAD_PROTOBUF)
     if(USERVER_DOWNLOAD_PACKAGE_PROTOBUF)
         find_package(Protobuf QUIET)
     else()
-        find_package(Protobuf CONFIG)
+        find_package(Protobuf CONFIG QUIET)
         if (NOT Protobuf_FOUND)
             find_package(Protobuf)
         endif()
@@ -60,7 +60,7 @@ if(NOT USERVER_FORCE_DOWNLOAD_PROTOBUF)
 
     if(Protobuf_FOUND)
         _userver_set_protobuf_version_category()
-        set(PROTOBUF_PROTOC "${Protobuf_PROTOC_EXECUTABLE}")
+        set(PROTOBUF_PROTOC $<TARGET_FILE:protobuf::protoc>)
         return()
     endif()
 endif()

cmake/UserverGrpcTargets.cmake

@@ -52,10 +52,10 @@ function(_userver_prepare_grpc)
     elseif(protobuf_INCLUDE_DIRS)
         set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${protobuf_INCLUDE_DIRS}")
     else()
-        # maybe we found protobuf config
-        get_target_property(_incs protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
-        if (_incs)
-            set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${_incs}")
+        # maybe we found the protobuf config
+        get_target_property(Protobuf_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
+        if (Protobuf_INCLUDE_DIR)
+            set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${Protobuf_INCLUDE_DIR}")
         else()
             message(FATAL_ERROR "Invalid Protobuf package")
         endif()
@@ -67,7 +67,7 @@ function(_userver_prepare_grpc)
     if(NOT gRPC_VERSION)
         message(FATAL_ERROR "Invalid gRPC package")
     endif()
-    if(NOT PROTOBUF_PROTOC AND NOT TARGET protobuf::libprotoc)
+    if(NOT PROTOBUF_PROTOC)
         message(FATAL_ERROR "protoc not found")
     endif()
     if(NOT PROTO_GRPC_CPP_PLUGIN)