From 9e8e00301f3db39011a1a604dd4da83f23036509 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 2 Sep 2021 15:37:36 +0200 Subject: Fix automoc for test in case of topLevel build In top level build , main configure can complain that moc does not exist during generator phase. Mark moc as enabled. Change-Id: I55db6ada209939cc4cbedab4654b654cd741c535 Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 7e2016039132538fedfe51e4be51998f9b7be929) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/httpserver/httpserver.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/httpserver/httpserver.cmake b/tests/auto/httpserver/httpserver.cmake index d67648f9c..84b350c0e 100644 --- a/tests/auto/httpserver/httpserver.cmake +++ b/tests/auto/httpserver/httpserver.cmake @@ -1,9 +1,5 @@ if (NOT TARGET Test::HttpServer) - if(NOT QT_SUPERBUILD AND NOT QT_CONFIGURE_RUNNING) - set(CMAKE_AUTOMOC ON) - endif() - add_library(httpserver STATIC ${CMAKE_CURRENT_LIST_DIR}/httpreqrep.cpp ${CMAKE_CURRENT_LIST_DIR}/httpreqrep.h @@ -13,6 +9,9 @@ if (NOT TARGET Test::HttpServer) ${CMAKE_CURRENT_LIST_DIR}/proxy_server.cpp ) + # moc binary might not exist in case of top level build + qt_autogen_tools(httpserver ENABLE_AUTOGEN_TOOLS "moc") + if(QT_FEATURE_ssl) target_sources(httpserver INTERFACE ${CMAKE_CURRENT_LIST_DIR}/httpsserver.h) endif() -- cgit v1.2.3