From 854bdc6a16fc3ff98c537e87b5fea8f90c67b96c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 30 Aug 2021 17:41:27 +0200 Subject: Simplify test examples target includes Fix condition to include examples and tests based on targets. We are no longer behind external project so we can simply check for targets. Fix issue for including automoc call when running qt configure when doing top level build. Task-number: QTBUG-95590 Change-Id: I0cd2d8016e14ddf296455277e968b43a923a7217 Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit faa74f9b402f6b5d78acdb71b05ca340684b3591) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/httpserver/httpserver.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/httpserver') diff --git a/tests/auto/httpserver/httpserver.cmake b/tests/auto/httpserver/httpserver.cmake index e10c52b76..d67648f9c 100644 --- a/tests/auto/httpserver/httpserver.cmake +++ b/tests/auto/httpserver/httpserver.cmake @@ -1,8 +1,8 @@ if (NOT TARGET Test::HttpServer) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - set(CMAKE_AUTOUIC ON) + if(NOT QT_SUPERBUILD AND NOT QT_CONFIGURE_RUNNING) + set(CMAKE_AUTOMOC ON) + endif() add_library(httpserver STATIC ${CMAKE_CURRENT_LIST_DIR}/httpreqrep.cpp -- cgit v1.2.3