review fixes

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()
@@ -92,4 +92,3 @@ set_target_properties(libprotoc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Prot
 write_package_stub(Protobuf)
 mark_targets_as_system("${Protobuf_SOURCE_DIR}")
 _userver_set_protobuf_version_category()
-set(PROTOBUF_PROTOC $<TARGET_FILE:protoc>)

cmake/UserverGrpcTargets.cmake

@@ -43,22 +43,11 @@ function(_userver_prepare_grpc)
         PARENT_SCOPE
     )
 
-    if(Protobuf_INCLUDE_DIR)
+    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}")
-    elseif(protobuf_INCLUDE_DIR)
-        set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${protobuf_INCLUDE_DIR}")
-    elseif(Protobuf_INCLUDE_DIRS)
-        set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${Protobuf_INCLUDE_DIRS}")
-    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}")
-        else()
-            message(FATAL_ERROR "Invalid Protobuf package")
-        endif()
+        message(FATAL_ERROR "Invalid Protobuf package")
     endif()
 
     if(NOT Protobuf_VERSION)
@@ -67,7 +56,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)