Removed _gRPC_*_INCLUDE_DIR

cmake/benchmark.cmake

@@ -21,7 +21,6 @@ if(gRPC_BENCHMARK_PROVIDER STREQUAL "module")
     add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark)
     if(TARGET benchmark)
       set(_gRPC_BENCHMARK_LIBRARIES benchmark)
-      set(_gRPC_BENCHMARK_INCLUDE_DIR "${BENCHMARK_ROOT_DIR}/include")
     endif()
   else()
     message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
@@ -31,8 +30,6 @@ elseif(gRPC_BENCHMARK_PROVIDER STREQUAL "package")
   find_package(benchmark REQUIRED CONFIG)
   if(TARGET benchmark::benchmark)
     set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark)
-    # extract the include dir from target's properties
-    get_target_property(_gRPC_BENCHMARK_INCLUDE_DIR benchmark::benchmark INTERFACE_INCLUDE_DIRECTORIES)
   endif()
   set(_gRPC_FIND_BENCHMARK "if(NOT benchmark_FOUND)\n  find_package(benchmark CONFIG)\nendif()")
 endif()

cmake/cares.cmake

@@ -26,7 +26,6 @@ if(gRPC_CARES_PROVIDER STREQUAL "module")
 
   if(TARGET c-ares)
     set(_gRPC_CARES_LIBRARIES c-ares)
-    set(_gRPC_CARES_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cares/cares" "${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares")
   endif()
 
   if(gRPC_INSTALL)
@@ -38,7 +37,6 @@ elseif(gRPC_CARES_PROVIDER STREQUAL "package")
   find_package(c-ares REQUIRED CONFIG)
   if(TARGET c-ares::cares)
     set(_gRPC_CARES_LIBRARIES c-ares::cares)
-    set(_gRPC_CARES_INCLUDE_DIR ${c-ares_INCLUDE_DIR})
   endif()
   set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n  find_package(c-ares CONFIG)\nendif()")
 endif()

cmake/gflags.cmake

@@ -19,7 +19,6 @@ if(gRPC_GFLAGS_PROVIDER STREQUAL "module")
   if(EXISTS "${GFLAGS_ROOT_DIR}/CMakeLists.txt")
     add_subdirectory(${GFLAGS_ROOT_DIR} third_party/gflags)
     set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
-    set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
   else()
     message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong")
   endif()
@@ -28,7 +27,6 @@ elseif(gRPC_GFLAGS_PROVIDER STREQUAL "package")
   find_package(gflags REQUIRED CONFIG)
   if(TARGET gflags::gflags)
     set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
-    set(_gRPC_GFLAGS_INCLUDE_DIR ${GFLAGS_INCLUDE_DIR})
   endif()
   set(_gRPC_FIND_GFLAGS "if(NOT gflags_FOUND)\n  find_package(gflags CONFIG)\nendif()")
 endif()

cmake/protobuf.cmake

@@ -41,7 +41,6 @@ if(gRPC_PROTOBUF_PROVIDER STREQUAL "module")
       set(_gRPC_PROTOBUF_PROTOC protoc)
       set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>)
     endif()
-    set(_gRPC_PROTOBUF_INCLUDE_DIR "${PROTOBUF_ROOT_DIR}")
     # For well-known .proto files distributed with protobuf
     set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR "${PROTOBUF_ROOT_DIR}/src")
   else()
@@ -79,7 +78,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
       set(_gRPC_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE})
       set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
     endif()
-    set(_gRPC_PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIRS})
     set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n  find_package(Protobuf ${gRPC_PROTOBUF_PACKAGE_TYPE})\nendif()")
   endif()
 endif()

templates/CMakeLists.txt.template

@@ -484,10 +484,6 @@
     PRIVATE
       <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
       <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_BENCHMARK_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_CARES_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_GFLAGS_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_PROTOBUF_INCLUDE_DIR}</%text>
       <%text>${_gRPC_SSL_INCLUDE_DIR}</%text>
       <%text>${_gRPC_UPB_GENERATED_DIR}</%text>
       <%text>${_gRPC_UPB_GRPC_GENERATED_DIR}</%text>
@@ -567,10 +563,6 @@
       <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
       <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/include
       <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_BENCHMARK_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_CARES_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_GFLAGS_INCLUDE_DIR}</%text>
-      <%text>${_gRPC_PROTOBUF_INCLUDE_DIR}</%text>
       <%text>${_gRPC_SSL_INCLUDE_DIR}</%text>
       <%text>${_gRPC_UPB_GENERATED_DIR}</%text>
       <%text>${_gRPC_UPB_GRPC_GENERATED_DIR}</%text>