fixing CMake bug by adding gflags dependency to grpc++_test_config

CMakeLists.txt

@@ -2371,6 +2371,7 @@ target_include_directories(grpc_test_util_unsecure
   endif()
 target_link_libraries(grpc_test_util_unsecure
   ${_gRPC_ALLTARGETS_LIBRARIES}
+  ${_gRPC_GFLAGS_LIBRARIES}
   gpr
   grpc_unsecure
 )
@@ -4014,6 +4015,7 @@ target_include_directories(grpc++_test_config
 target_link_libraries(grpc++_test_config
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 
@@ -16042,7 +16044,6 @@ target_link_libraries(thread_manager_test
   grpc_unsecure
   gpr
   grpc++_test_config
-  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 
@@ -18893,11 +18894,6 @@ target_link_libraries(uri_fuzzer_test_one_entry
 endif (gRPC_BUILD_TESTS)
 
 
-
-
-
-
-
 if (gRPC_INSTALL)
   install(EXPORT gRPCTargets
     DESTINATION ${gRPC_INSTALL_CMAKEDIR}

cmake/gflags.cmake

@@ -18,15 +18,12 @@ if("${gRPC_GFLAGS_PROVIDER}" STREQUAL "module")
   endif()
   if(EXISTS "${GFLAGS_ROOT_DIR}/CMakeLists.txt")
     add_subdirectory(${GFLAGS_ROOT_DIR} third_party/gflags)
-    if(TARGET gflags_static)
+    set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
-      set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
+    set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
-      set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
-    endif()
   else()
     message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong")
   endif()
 elseif("${gRPC_GFLAGS_PROVIDER}" STREQUAL "package")
-  message("gRPC GFLAGS is PACKAGE")
   # Use "CONFIG" as there is no built-in cmake module for gflags.
   find_package(gflags REQUIRED CONFIG)
   if(TARGET gflags)
@@ -35,3 +32,4 @@ elseif("${gRPC_GFLAGS_PROVIDER}" STREQUAL "package")
   endif()
   set(_gRPC_FIND_GFLAGS "if(NOT gflags_FOUND)\n  find_package(gflags CONFIG)\nendif()")
 endif()
+