Make sure we initialize moc rcc and uic for manual test targets

If manual test target is created using the standard Qt API but not
qt_internal_add_manual_test command, we need initialize autotools
for these targets. Add the generic functionality that ensures that
autotools are inialized for all manual tests.

Pick-to: 6.5 6.6
Change-Id: Ic048760390174d1be2f01096d70e84458f1c870f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 14 insertions, 42 deletions

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 337c140cd3..633d1b3140 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -284,27 +284,6 @@ macro(qt_build_internals_set_up_private_api)
     qt_check_if_tools_will_be_built()
 endmacro()
 
-# find all targets defined in $subdir by recursing through all added subdirectories
-# populates $qt_repo_targets with a ;-list of non-UTILITY targets
-macro(qt_build_internals_get_repo_targets subdir)
-    get_directory_property(_targets DIRECTORY "${subdir}" BUILDSYSTEM_TARGETS)
-    if(_targets)
-        foreach(_target IN LISTS _targets)
-            get_target_property(_type ${_target} TYPE)
-            if(NOT ${_type} STREQUAL "UTILITY")
-                list(APPEND qt_repo_targets "${_target}")
-            endif()
-        endforeach()
-    endif()
-
-    get_directory_property(_directories DIRECTORY "${subdir}" SUBDIRECTORIES)
-    if (_directories)
-        foreach(_directory IN LISTS _directories)
-            qt_build_internals_get_repo_targets("${_directory}")
-        endforeach()
-    endif()
-endmacro()
-
 # add toplevel targets for each subdirectory, e.g. qtbase_src
 function(qt_build_internals_add_toplevel_targets)
     set(qt_repo_target_all "")
@@ -312,7 +291,7 @@ function(qt_build_internals_add_toplevel_targets)
     foreach(directory IN LISTS directories)
         set(qt_repo_targets "")
         get_filename_component(qt_repo_target_basename ${directory} NAME)
-        qt_build_internals_get_repo_targets("${directory}")
+        _qt_internal_collect_buildsystem_targets(qt_repo_targets "${directory}" EXCLUDE UTILITY)
         if (qt_repo_targets)
             set(qt_repo_target_name "${qt_repo_targets_name}_${qt_repo_target_basename}")
             message(DEBUG "${qt_repo_target_name} depends on ${qt_repo_targets}")
@@ -828,6 +807,17 @@ macro(qt_build_tests)
         endif()
         if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/manual/CMakeLists.txt" AND QT_BUILD_MANUAL_TESTS)
             add_subdirectory(manual)
+            # Adding this logic to all tests impacts the configure time ~3sec in addition. We still
+            # might want this in the future for other test types since currently we have a moderate
+            # subset of tests that require manual initialization of autotools.
+            _qt_internal_collect_buildsystem_targets(targets
+                "${CMAKE_CURRENT_SOURCE_DIR}/manual" EXCLUDE UTILITY ALIAS)
+            foreach(target ${targets})
+                qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "moc" "rcc")
+                if(TARGET Qt::Widgets)
+                    qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "uic")
+                endif()
+            endforeach()
         endif()
     endif()
 
@@ -1022,26 +1012,8 @@ macro(qt_examples_build_end)
     # sure we do not fail on a fresh Qt build (e.g. the moc binary won't exist
     # yet because it is created at build time).
 
-    # This function gets all targets below this directory (excluding custom targets and aliases)
-    function(get_all_targets _result _dir)
-        get_property(_subdirs DIRECTORY "${_dir}" PROPERTY SUBDIRECTORIES)
-        foreach(_subdir IN LISTS _subdirs)
-            get_all_targets(${_result} "${_subdir}")
-        endforeach()
-        get_property(_sub_targets DIRECTORY "${_dir}" PROPERTY BUILDSYSTEM_TARGETS)
-        set(_real_targets "")
-        if(_sub_targets)
-            foreach(__target IN LISTS _sub_targets)
-                get_target_property(target_type ${__target} TYPE)
-                if(NOT target_type STREQUAL "UTILITY" AND NOT target_type STREQUAL "ALIAS")
-                    list(APPEND _real_targets ${__target})
-                endif()
-            endforeach()
-        endif()
-        set(${_result} ${${_result}} ${_real_targets} PARENT_SCOPE)
-    endfunction()
-
-    get_all_targets(targets "${CMAKE_CURRENT_SOURCE_DIR}")
+    _qt_internal_collect_buildsystem_targets(targets
+        "${CMAKE_CURRENT_SOURCE_DIR}" EXCLUDE UTILITY ALIAS)
 
     foreach(target ${targets})
         qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "moc" "rcc")