grpc/grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
Benjamin A. Beasley ce88e01640 New version 1.37.1
- General:
  * New version 1.37.1
  * Drop patches that were upstreamed since the last packaged release, were
    backported from upstream in the first place, or have otherwise been
    obsoleted by upstream changes.
  * Rebase/update remaining patches as needed
  * Drop Fedora 32 compatibility
- C (core) and C++ (cpp):
  * Switch to CMake build system and add CMake files to -devel package
  * Build with C++17 for compatibility with the abseil-cpp package in Fedora
  * Run the port server during core tests
2021-05-11 08:57:48 -04:00

51 lines
1.5 KiB
Diff

diff -Naur grpc-1.37.1-original/CMakeLists.txt grpc-1.37.1/CMakeLists.txt
--- grpc-1.37.1-original/CMakeLists.txt 2021-04-27 18:01:25.000000000 -0400
+++ grpc-1.37.1/CMakeLists.txt 2021-05-04 11:00:04.934427672 -0400
@@ -3294,10 +3294,6 @@
${_gRPC_UPB_INCLUDE_DIR}
${_gRPC_XXHASH_INCLUDE_DIR}
${_gRPC_ZLIB_INCLUDE_DIR}
- third_party/googletest/googletest/include
- third_party/googletest/googletest
- third_party/googletest/googlemock/include
- third_party/googletest/googlemock
${_gRPC_PROTO_GENS_DIR}
)
target_link_libraries(grpc++_test_config
@@ -10669,7 +10665,6 @@
endif()
-if(gRPC_BUILD_TESTS)
add_executable(grpc_cli
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc
@@ -10683,8 +10678,6 @@
test/cpp/util/proto_file_parser.cc
test/cpp/util/proto_reflection_descriptor_database.cc
test/cpp/util/service_describer.cc
- third_party/googletest/googletest/src/gtest-all.cc
- third_party/googletest/googlemock/src/gmock-all.cc
)
target_include_directories(grpc_cli
@@ -10699,10 +10692,6 @@
${_gRPC_UPB_INCLUDE_DIR}
${_gRPC_XXHASH_INCLUDE_DIR}
${_gRPC_ZLIB_INCLUDE_DIR}
- third_party/googletest/googletest/include
- third_party/googletest/googletest
- third_party/googletest/googlemock/include
- third_party/googletest/googlemock
${_gRPC_PROTO_GENS_DIR}
)
@@ -10715,7 +10704,6 @@
)
-endif()
if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN)
add_executable(grpc_cpp_plugin