1 files changed, 52 insertions, 45 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 273a169aee..bb3cedc953 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,68 +10,75 @@ project(QtBase
     LANGUAGES CXX C ASM
 )
 
-## Add some paths to check for cmake modules:
-list(PREPEND CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/extra-cmake-modules/find-modules"
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
-)
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    ## Add some paths to check for cmake modules:
+    list(PREPEND CMAKE_MODULE_PATH
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/extra-cmake-modules/find-modules"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
+    )
+
+    ## Find the build internals package.
+    set(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION TRUE)
+    list(PREPEND CMAKE_PREFIX_PATH
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+    )
+    find_package(QtBuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
+    unset(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION)
+else()
+    # When building standalone tests, an istalled BuildInternals package already exists.
+    find_package(Qt6 REQUIRED COMPONENTS BuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
+endif()
 
-## Find the build internals package.
-set(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION TRUE)
-list(PREPEND CMAKE_PREFIX_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-)
-find_package(QtBuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
-unset(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION)
 qt_build_repo_begin()
 
-## Should this Qt be static or dynamically linked?
-option(BUILD_SHARED_LIBS "Build Qt statically or dynamically" ON)
-set(QT_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-
-## Should this Qt be built with Werror?
-option(WARNINGS_ARE_ERRORS "Build Qt with warnings as errors" ${FEATURE_developer_build})
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    ## Should this Qt be static or dynamically linked?
+    option(BUILD_SHARED_LIBS "Build Qt statically or dynamically" ON)
+    set(QT_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
-## Should Qt be built using PCH?
-option(BUILD_WITH_PCH "Build Qt using precompiled headers?" ON)
+    ## Should this Qt be built with Werror?
+    option(WARNINGS_ARE_ERRORS "Build Qt with warnings as errors" ${FEATURE_developer_build})
 
-## QtBase specific configure tests:
-include(QtBaseConfigureTests)
+    ## Should Qt be built using PCH?
+    option(BUILD_WITH_PCH "Build Qt using precompiled headers?" ON)
 
-## Build System tests:
-include(QtBaseCMakeTesting)
+    ## QtBase specific configure tests:
+    include(QtBaseConfigureTests)
 
-## Targets for global features, etc.:
-include(QtBaseGlobalTargets)
+    ## Build System tests:
+    include(QtBaseCMakeTesting)
 
-qt_set_language_standards()
+    ## Targets for global features, etc.:
+    include(QtBaseGlobalTargets)
 
-## Decide whether tools will be built.
-qt_check_if_tools_will_be_built()
+    ## Set language standards after QtBaseGlobalTargets, because that's when the relevant
+    ## feature variables are available.
+    qt_set_language_standards()
 
-## Visit all the directories:
-add_subdirectory(src)
+    ## Visit all the directories:
+    add_subdirectory(src)
+endif()
 
-if (BUILD_TESTING)
+if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-if (QT_WILL_BUILD_TOOLS)
-    add_subdirectory(qmake)
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    if(QT_WILL_BUILD_TOOLS)
+        add_subdirectory(qmake)
+    endif()
+    # As long as we use the mkspecs (for qplatformdefs.h), we need to always
+    # install it, especially when cross-compiling.
+    set(mkspecs_install_dir "${INSTALL_DATADIR}")
+    qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
+
+    qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
+                       DESTINATION ${mkspecs_install_dir})
 endif()
 
-# As long as we use the mkspecs (for qplatformdefs.h), we need to always
-# install it, especially when cross-compiling.
-set(mkspecs_install_dir "${INSTALL_DATADIR}")
-qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
-
-qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
-                   DESTINATION ${mkspecs_install_dir})
-
-
 qt_build_repo_end()
 
-if(BUILD_EXAMPLES)
+if(NOT QT_BUILD_STANDALONE_TESTS AND BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()