Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed _gRPC_*_INCLUDE_DIR

Browse Source
pull/20901/head
Esun Kim 6 years ago
parent 6dde2f43f7
commit f33a7645c5
6 changed files with 0 additions and 1621 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1604
      CMakeLists.txt
  2. 3
      cmake/benchmark.cmake
  3. 2
      cmake/cares.cmake
  4. 2
      cmake/gflags.cmake
  5. 2
      cmake/protobuf.cmake
  6. 8
      templates/CMakeLists.txt.template

1604
CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

3
cmake/benchmark.cmake
Unescape View File

@ -21,7 +21,6 @@ if(gRPC_BENCHMARK_PROVIDER STREQUAL "module")
add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark) add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark)
if(TARGET benchmark) if(TARGET benchmark)
set(_gRPC_BENCHMARK_LIBRARIES benchmark) set(_gRPC_BENCHMARK_LIBRARIES benchmark)
set(_gRPC_BENCHMARK_INCLUDE_DIR "${BENCHMARK_ROOT_DIR}/include")
endif() endif()
else() else()
message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong") 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) find_package(benchmark REQUIRED CONFIG)
if(TARGET benchmark::benchmark) if(TARGET benchmark::benchmark)
set(_gRPC_BENCHMARK_LIBRARIES 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() endif()
set(_gRPC_FIND_BENCHMARK "if(NOT benchmark_FOUND)\n find_package(benchmark CONFIG)\nendif()") set(_gRPC_FIND_BENCHMARK "if(NOT benchmark_FOUND)\n find_package(benchmark CONFIG)\nendif()")
endif() endif()

2
cmake/cares.cmake
Unescape View File

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

2
cmake/gflags.cmake
Unescape View File

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

2
cmake/protobuf.cmake
Unescape View File

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

8
templates/CMakeLists.txt.template
Unescape View File

@ -484,10 +484,6 @@
PRIVATE PRIVATE
<%text>${CMAKE_CURRENT_SOURCE_DIR}</%text> <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
<%text>${_gRPC_ADDRESS_SORTING_INCLUDE_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_SSL_INCLUDE_DIR}</%text>
<%text>${_gRPC_UPB_GENERATED_DIR}</%text> <%text>${_gRPC_UPB_GENERATED_DIR}</%text>
<%text>${_gRPC_UPB_GRPC_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>
<%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/include <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/include
<%text>${_gRPC_ADDRESS_SORTING_INCLUDE_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_SSL_INCLUDE_DIR}</%text>
<%text>${_gRPC_UPB_GENERATED_DIR}</%text> <%text>${_gRPC_UPB_GENERATED_DIR}</%text>
<%text>${_gRPC_UPB_GRPC_GENERATED_DIR}</%text> <%text>${_gRPC_UPB_GRPC_GENERATED_DIR}</%text>

Write Preview
Loading…
Cancel
Save