CMake: Move qt_internal_read_repo_dependencies into QtBuildRepoHelpers

Previously qt_internal_read_repo_dependencies had to be defined
before QtBuildInternalsExtra.cmake was included because the file
called the function.

Instead of calling the function in QtBuildInternalsExtra.cmake, just
call it later after the Helpers have been loaded. We can do this
because the function is always called unconditionally, so no point in
doing it in the generated file.
This lets us move the function into the QtBuildRepoHelpers.

Amends 98e8180e56322ce065e39cc1ef1d65b54caa8c25
Amends a804ac3d881fb036619f323f64e778a9e00b181d

Task-number: QTBUG-86035
Change-Id: Idffed8f2eb9d728c779b77b31eba0d24d85752ea
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Alexey Edelev <[email protected]>

3 files changed, 52 insertions, 52 deletions

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 21ff79f9c19..d1857521b2e 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -6,47 +6,6 @@ cmake_minimum_required(VERSION 3.16...3.21)
 
 set(QT_BACKUP_CMAKE_INSTALL_PREFIX_BEFORE_EXTRA_INCLUDE "${CMAKE_INSTALL_PREFIX}")
 
-# Recursively reads the dependencies section from dependencies.yaml in ${repo_dir} and returns the
-# list of dependencies, including transitive ones, in out_var.
-#
-# The returned dependencies are topologically sorted.
-#
-# Example output for qtdeclarative:
-# qtbase;qtimageformats;qtlanguageserver;qtshadertools;qtsvg
-#
-function(qt_internal_read_repo_dependencies out_var repo_dir)
-    set(seen ${ARGN})
-    set(dependencies "")
-    set(in_dependencies_section FALSE)
-    set(dependencies_file "${repo_dir}/dependencies.yaml")
-    if(EXISTS "${dependencies_file}")
-        file(STRINGS "${dependencies_file}" lines)
-        foreach(line IN LISTS lines)
-            if(line MATCHES "^([^ ]+):")
-                if(CMAKE_MATCH_1 STREQUAL "dependencies")
-                    set(in_dependencies_section TRUE)
-                else()
-                    set(in_dependencies_section FALSE)
-                endif()
-            elseif(in_dependencies_section AND line MATCHES "^  (.+):$")
-                set(dependency "${CMAKE_MATCH_1}")
-                set(dependency_repo_dir "${repo_dir}/${dependency}")
-                string(REGEX MATCH "[^/]+$" dependency "${dependency}")
-                if(NOT dependency IN_LIST seen)
-                    qt_internal_read_repo_dependencies(subdeps "${dependency_repo_dir}"
-                        ${seen} ${dependency})
-                    if(dependency MATCHES "^tqtc-(.+)")
-                        set(dependency "${CMAKE_MATCH_1}")
-                    endif()
-                    list(APPEND dependencies ${subdeps} ${dependency})
-                endif()
-            endif()
-        endforeach()
-        list(REMOVE_DUPLICATES dependencies)
-    endif()
-    set(${out_var} "${dependencies}" PARENT_SCOPE)
-endfunction()
-
 # This depends on qt_internal_read_repo_dependencies existing.
 if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake")
     include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake)
diff --git a/cmake/QtBuildRepoHelpers.cmake b/cmake/QtBuildRepoHelpers.cmake
index 93066b2df4e..87be088b6e7 100644
--- a/cmake/QtBuildRepoHelpers.cmake
+++ b/cmake/QtBuildRepoHelpers.cmake
@@ -877,7 +877,59 @@ macro(qt_internal_setup_standalone_test_when_called_as_a_find_package_component)
 endmacro()
 
 macro(qt_internal_setup_build_internals)
+    qt_internal_set_qt_repo_dependencies()
     qt_internal_setup_platform_support_variables()
     qt_internal_setup_pkg_config_and_system_prefixes()
     qt_internal_setup_standalone_test_when_called_as_a_find_package_component()
 endmacro()
+
+# Recursively reads the dependencies section from dependencies.yaml in ${repo_dir} and returns the
+# list of dependencies, including transitive ones, in out_var.
+#
+# The returned dependencies are topologically sorted.
+#
+# Example output for qtdeclarative:
+# qtbase;qtimageformats;qtlanguageserver;qtshadertools;qtsvg
+#
+function(qt_internal_read_repo_dependencies out_var repo_dir)
+    set(seen ${ARGN})
+    set(dependencies "")
+    set(in_dependencies_section FALSE)
+    set(dependencies_file "${repo_dir}/dependencies.yaml")
+    if(EXISTS "${dependencies_file}")
+        file(STRINGS "${dependencies_file}" lines)
+        foreach(line IN LISTS lines)
+            if(line MATCHES "^([^ ]+):")
+                if(CMAKE_MATCH_1 STREQUAL "dependencies")
+                    set(in_dependencies_section TRUE)
+                else()
+                    set(in_dependencies_section FALSE)
+                endif()
+            elseif(in_dependencies_section AND line MATCHES "^  (.+):$")
+                set(dependency "${CMAKE_MATCH_1}")
+                set(dependency_repo_dir "${repo_dir}/${dependency}")
+                string(REGEX MATCH "[^/]+$" dependency "${dependency}")
+                if(NOT dependency IN_LIST seen)
+                    qt_internal_read_repo_dependencies(subdeps "${dependency_repo_dir}"
+                        ${seen} ${dependency})
+                    if(dependency MATCHES "^tqtc-(.+)")
+                        set(dependency "${CMAKE_MATCH_1}")
+                    endif()
+                    list(APPEND dependencies ${subdeps} ${dependency})
+                endif()
+            endif()
+        endforeach()
+        list(REMOVE_DUPLICATES dependencies)
+    endif()
+    set(${out_var} "${dependencies}" PARENT_SCOPE)
+endfunction()
+
+macro(qt_internal_set_qt_repo_dependencies)
+    # The top-level check needs to happen because it's possible
+    # to configure a top-level build with a few repos and then configure another repo
+    # using qt-configure-module in a separate build dir, where QT_SUPERBUILD will not
+    # be set anymore.
+    if(DEFINED QT_REPO_MODULE_VERSION AND NOT DEFINED QT_REPO_DEPENDENCIES AND NOT QT_SUPERBUILD)
+        qt_internal_read_repo_dependencies(QT_REPO_DEPENDENCIES "${PROJECT_SOURCE_DIR}")
+    endif()
+endmacro()
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
index 5c904b1050f..531016aba2b 100644
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -718,17 +718,6 @@ endif()\n")
 
         string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "${install_prefix_content}")
 
-        # The top-level check needs to happen inside QtBuildInternals, because it's possible
-        # to configure a top-level build with a few repos and then configure another repo
-        # using qt-configure-module in a separate build dir, where QT_SUPERBUILD will not
-        # be set anymore.
-        string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
-            "
-if(DEFINED QT_REPO_MODULE_VERSION AND NOT DEFINED QT_REPO_DEPENDENCIES AND NOT QT_SUPERBUILD)
-    qt_internal_read_repo_dependencies(QT_REPO_DEPENDENCIES \"$\{PROJECT_SOURCE_DIR}\")
-endif()
-")
-
         if(DEFINED OpenGL_GL_PREFERENCE)
             string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
                 "