From 6de39ba5eb25ceeb21923a8c85c9cf6ad7208326 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Sep 2025 14:52:13 +0200 Subject: [PATCH] Guard tst_grpc_client_test_common build The libraty cannot be built if grpc_testserver is missing. Pick-to: 6.10 6.9 6.8 Change-Id: I34f6a419e2726ec23ac78f0b95f0974df2080547 Reviewed-by: Dennis Oberst --- .../client/shared/client_test_common/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/auto/grpc/client/shared/client_test_common/CMakeLists.txt b/tests/auto/grpc/client/shared/client_test_common/CMakeLists.txt index cf0b5f83..4628148d 100644 --- a/tests/auto/grpc/client/shared/client_test_common/CMakeLists.txt +++ b/tests/auto/grpc/client/shared/client_test_common/CMakeLists.txt @@ -1,6 +1,10 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause +if(NOT TARGET grpc_testserver) + return() +endif() + set(CMAKE_AUTOMOC TRUE) qt6_add_library(tst_grpc_client_test_common STATIC @@ -8,11 +12,9 @@ qt6_add_library(tst_grpc_client_test_common STATIC ${CMAKE_CURRENT_LIST_DIR}/grpcclienttestbase.cpp ) -if(TARGET grpc_testserver) - target_compile_definitions(tst_grpc_client_test_common PRIVATE - TEST_GRPC_SERVER_PATH="$" - ) -endif() +target_compile_definitions(tst_grpc_client_test_common PRIVATE + TEST_GRPC_SERVER_PATH="$" +) if(qt_internal_grpc_use_golang_test_server) target_compile_definitions(tst_grpc_client_test_common PRIVATE