Avoid collecting dependencies from modules that were explicitly skipped

If either -skip <module> or BUILD_<module>=OFF is set from command line
we should avoid processing the module dependencies and exclude it from
the list of modules that needs to be build.

Pick-to: 6.7
Change-Id: Ieec8db085221cc4abd5d8ac83c06ecce25d5d4b0
Reviewed-by: Alexandru Croitor <[email protected]>

Author: semlanik

Diff for: CMakeLists.txt

@@ -29,16 +29,26 @@ include(ECMOptionalAddSubdirectory)
 
 qt_internal_top_level_before_build_submodules()
 
+qt_internal_find_modules(known_submodules)
 # Get submodule list if not already defined
 if(NOT QT_BUILD_SUBMODULES)
     if(DEFINED ENV{QT_BUILD_SUBMODULES})
         set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
     else()
-        qt_internal_find_modules(QT_BUILD_SUBMODULES)
+        set(QT_BUILD_SUBMODULES "${known_submodules}")
     endif()
 endif()
 set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
 
+# Preliminary check if module should be skipped since -skip <module> or BUILD_<module>
+# are provided.
+set(explicitly_skipped_modules "")
+foreach(module IN LISTS known_submodules)
+    if(DEFINED BUILD_${module} AND NOT BUILD_${module})
+        list(APPEND explicitly_skipped_modules ${module})
+    endif()
+endforeach()
+
 foreach(module IN LISTS QT_BUILD_SUBMODULES)
     if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
         message(FATAL_ERROR
@@ -49,7 +59,8 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
     endif()
 endforeach()
 
-qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
+qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
+    SKIP_MODULES ${explicitly_skipped_modules})
 
 foreach(module IN LISTS QT_BUILD_SUBMODULES)
     # Check for unmet dependencies

Diff for: cmake/QtTopLevelHelpers.cmake

@@ -184,22 +184,24 @@ endfunction()
 #
 # NORMALIZE_REPO_NAME_IF_NEEDED Will remove 'tqtc-' from the beginning of submodule dependencies
 # if a tqtc- named directory does not exist.
+#
+# SKIP_MODULES Modules that should be skipped from evaluation completely.
 function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
     set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED PARSE_GITMODULES
                 EXCLUDE_OPTIONAL_DEPS)
     set(oneValueArgs REVISION SKIPPED_VAR GITMODULES_PREFIX_VAR)
-    set(multiValueArgs PARSED_DEPENDENCIES)
+    set(multiValueArgs PARSED_DEPENDENCIES SKIP_MODULES)
     cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     # Clear the property that stores the repositories we've already seen.
     if(NOT arg_IN_RECURSION)
         set_property(GLOBAL PROPERTY _qt_internal_seen_repos)
     endif()
 
-    # Bail out if we've seen the module already.
+    # Bail out if we've seen the module already or it was skipped explicitly from command line.
     qt_internal_resolve_module_dependencies_set_skipped(FALSE)
     get_property(seen GLOBAL PROPERTY _qt_internal_seen_repos)
-    if(module IN_LIST seen)
+    if(module IN_LIST seen OR module IN_LIST arg_SKIP_MODULES)
         qt_internal_resolve_module_dependencies_set_skipped(TRUE)
         return()
     endif()
@@ -287,6 +289,11 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
             set(exclude_optional_deps "EXCLUDE_OPTIONAL_DEPS")
         endif()
 
+        set(extra_options "")
+        if(arg_SKIP_MODULES)
+            list(extra_options APPEND SKIP_MODULES ${arg_SKIP_MODULES})
+        endif()
+
         qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions
             REVISION "${revision}"
             SKIPPED_VAR skipped
@@ -295,6 +302,7 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
             ${parse_gitmodules}
             ${exclude_optional_deps}
             GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
+            ${extra_options}
         )
         if(NOT skipped)
             list(APPEND ordered ${dep_ordered})
@@ -321,11 +329,13 @@ endfunction()
 # EXCLUDE_OPTIONAL_DEPS is a keyword argument that excludes optional dependencies from the result.
 # See qt_internal_resolve_module_dependencies for details.
 #
+# SKIP_MODULES Modules that should be skipped from evaluation completely.
+#
 # See qt_internal_resolve_module_dependencies for side effects.
 function(qt_internal_sort_module_dependencies modules out_all_ordered)
     set(options PARSE_GITMODULES EXCLUDE_OPTIONAL_DEPS)
     set(oneValueArgs GITMODULES_PREFIX_VAR)
-    set(multiValueArgs "")
+    set(multiValueArgs SKIP_MODULES)
     cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     set(parse_gitmodules "")
@@ -345,12 +355,18 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
         list(APPEND all_selected_repos_as_parsed_dependencies "${module}/HEAD/FALSE")
     endforeach()
 
+    set(extra_args "")
+    if(arg_SKIP_MODULES)
+        set(extra_args SKIP_MODULES ${arg_SKIP_MODULES})
+    endif()
+
     qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions
         PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
         NORMALIZE_REPO_NAME_IF_NEEDED
         ${exclude_optional_deps}
         ${parse_gitmodules}
         GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
+        ${extra_args}
     )
 
     # Drop "all_selected_repos" from the output. It depends on all selected repos, thus it must be