2 files changed, 13 insertions, 8 deletions
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake
index ad94f278f..a4641ee65 100644
--- a/sources/pyside6/cmake/PySideHelpers.cmake
+++ b/sources/pyside6/cmake/PySideHelpers.cmake
@@ -173,13 +173,6 @@ macro(use_protected_as_public_hack)
 endmacro()
 
 macro(remove_skipped_modules)
-    # Removing from the MODULES list the items that were defined with
-    # -DSKIP_MODULES on command line
-    if(SKIP_MODULES)
-        foreach(s ${SKIP_MODULES})
-            list(REMOVE_ITEM MODULES ${s})
-        endforeach()
-    endif()
 
     foreach(m ${MODULES})
         collect_module_if_found(${m})
@@ -221,7 +214,6 @@ macro(collect_module_if_found shortname)
         set(quiet_argument "QUIET")
     endif()
 
-    find_package(${_qt_module_name} ${quiet_argument})
     # If package is found, _name_found will be equal to 1
     set(_name_found "${_qt_module_name}_FOUND")
     # _name_dir will keep the path to the directory where the CMake rules were found
diff --git a/sources/pyside6/cmake/PySideSetup.cmake b/sources/pyside6/cmake/PySideSetup.cmake
index 34ec035b7..c92b0c986 100644
--- a/sources/pyside6/cmake/PySideSetup.cmake
+++ b/sources/pyside6/cmake/PySideSetup.cmake
@@ -170,7 +170,20 @@ collect_optional_modules()
 # Modules to be built unless specified by -DMODULES on command line
 if(NOT MODULES)
     set(MODULES "${ALL_ESSENTIAL_MODULES};${ALL_OPTIONAL_MODULES}")
+    set(required_modules ${ALL_ESSENTIAL_MODULES})
+    set(optional_modules ${ALL_OPTIONAL_MODULES})
+else()
+    set(required_modules ${MODULES})
+    set(optional_modules)
 endif()
+list(REMOVE_ITEM MODULES ${SKIP_MODULES})
+list(REMOVE_ITEM required_modules ${SKIP_MODULES})
+list(REMOVE_ITEM optional_modules ${SKIP_MODULES})
+
+find_package(Qt6
+    COMPONENTS ${required_modules}
+    OPTIONAL_COMPONENTS ${optional_modules}
+)
 
 # This will contain the set of modules for which bindings are not built.
 set(DISABLED_MODULES "${ALL_ESSENTIAL_MODULES};${ALL_OPTIONAL_MODULES}")