From 19588b81df19f9e294c223368829bb0399a366bf Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 4 Jul 2023 19:38:02 +0200 Subject: [PATCH] Exclude native grpc channels from the Qt packaging configurations Native gRPC channels rely on the reference gRPC implementation that doesn't guarantee the ABI compatibility between different versions. We shouldn't link libQt6GRPC to any 3rdparty libraries that are not delivered as part of Qt when make packaging builds in CI. Pick-to: 6.5 6.6 Fixes: QTBUG-115055 Fixes: QTBUG-110107 Change-Id: I10081b4bd2477ee4f3a7edcd172066c08c6dd972 Reviewed-by: Alexandru Croitor --- tests/CMakeLists.txt | 1 + tests/auto/grpc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index de9e453a..eb30fa2b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,5 +5,6 @@ if(QT_BUILD_STANDALONE_TESTS) # Gui is need to build and run tests on Android Platforms. find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Protobuf Grpc) find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Quick QuickTest) + find_package(WrapgRPC QUIET) endif() qt_build_tests() diff --git a/tests/auto/grpc/CMakeLists.txt b/tests/auto/grpc/CMakeLists.txt index 9276ec1b..215348d5 100644 --- a/tests/auto/grpc/CMakeLists.txt +++ b/tests/auto/grpc/CMakeLists.txt @@ -8,7 +8,7 @@ endif() # Set the default message latency for the gRPC tests in milliseconds. add_compile_definitions(QT_GRPC_TEST_MESSAGE_LATENCY=${QT_INTERNAL_GRPC_TEST_MESSAGE_LATENCY_MSEC}) -if(QT_FEATURE_native_grpc) +if(TARGET WrapgRPC::WrapLibgRPC) add_subdirectory(shared) add_subdirectory(client) add_subdirectory(server)