diff options
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtBuild.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtBuildHelpers.cmake | 9 | ||||
| -rw-r--r-- | cmake/QtBuildInformation.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtBuildRepoHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPostProcess.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtSeparateDebugInfo.cmake | 2 |
8 files changed, 11 insertions, 15 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 1716c3a3fc..b32692805d 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -63,10 +63,8 @@ qt_copy_or_install( set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/${__build_internals_standalone_test_template_dir}/CMakeLists.txt") -include(QtToolchainHelpers) qt_internal_create_toolchain_file() -include(QtWrapperScriptHelpers) qt_internal_create_wrapper_scripts() ## Library to hold global features: @@ -134,7 +132,6 @@ target_include_directories(GlobalConfigPrivate INTERFACE ) add_library(Qt::GlobalConfigPrivate ALIAS GlobalConfigPrivate) -include(QtPlatformTargetHelpers) qt_internal_setup_public_platform_target() # defines PlatformCommonInternal PlatformModuleInternal PlatformPluginInternal PlatformToolInternal diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 2af9dd6e8d..ee24ba188e 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1,7 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -include(QtBuildHelpers) - -qt_internal_include_all_helpers() qt_internal_setup_build_and_global_variables() diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake index 62a3b3d5c9..5abc1ad798 100644 --- a/cmake/QtBuildHelpers.cmake +++ b/cmake/QtBuildHelpers.cmake @@ -123,7 +123,9 @@ endmacro() macro(qt_internal_include_all_helpers) # Upstream cmake modules. include(CheckCXXSourceCompiles) + include(CMakeFindBinUtils) include(CMakePackageConfigHelpers) + include(FeatureSummary) # Internal helpers available only while building Qt itself. include(Qt3rdPartyLibraryHelpers) @@ -133,7 +135,10 @@ macro(qt_internal_include_all_helpers) include(QtBuildInformation) include(QtBuildOptionsHelpers) include(QtBuildPathsHelpers) + include(QtBuildRepoExamplesHelpers) + include(QtBuildRepoHelpers) include(QtCMakeHelpers) + include(QtCMakeVersionHelpers) include(QtDbusHelpers) include(QtDeferredDependenciesHelpers) include(QtDocsHelpers) @@ -151,7 +156,9 @@ macro(qt_internal_include_all_helpers) include(QtModuleHelpers) include(QtNoLinkTargetHelpers) include(QtPkgConfigHelpers) + include(QtPlatformTargetHelpers) include(QtPluginHelpers) + include(QtPostProcessHelpers) include(QtPrecompiledHeadersHelpers) include(QtPriHelpers) include(QtPrlHelpers) @@ -166,9 +173,11 @@ macro(qt_internal_include_all_helpers) include(QtSyncQtHelpers) include(QtTargetHelpers) include(QtTestHelpers) + include(QtToolchainHelpers) include(QtToolHelpers) include(QtUnityBuildHelpers) include(QtWasmHelpers) + include(QtWrapperScriptHelpers) # Helpers that are available in public projects and while building Qt itself. include(QtPublicAppleHelpers) diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index 40c95ac633..165b9c97ee 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -27,7 +27,6 @@ function(qt_print_feature_summary) endif() endif() - include(FeatureSummary) # Show which packages were found. feature_summary(INCLUDE_QUIET_PACKAGES WHAT PACKAGES_FOUND diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index d1857521b2..129f1ebb77 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -62,7 +62,7 @@ if(NOT QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION) qt_set_up_build_internals_paths() endif() -include(QtBuildRepoExamplesHelpers) -include(QtBuildRepoHelpers) +include(QtBuildHelpers) +qt_internal_include_all_helpers() qt_internal_setup_build_internals() diff --git a/cmake/QtBuildRepoHelpers.cmake b/cmake/QtBuildRepoHelpers.cmake index 87be088b6e..f02d846638 100644 --- a/cmake/QtBuildRepoHelpers.cmake +++ b/cmake/QtBuildRepoHelpers.cmake @@ -9,7 +9,6 @@ # components that are involved in build procedure. macro(qt_internal_project_setup) # Check for the minimum CMake version. - include(QtCMakeVersionHelpers) qt_internal_require_suitable_cmake_version() qt_internal_upgrade_cmake_policies() endmacro() @@ -20,7 +19,6 @@ macro(qt_build_internals_set_up_private_api) # Qt specific setup common for all modules: include(QtSetup) - include(FeatureSummary) # Optionally include a repo specific Setup module. include(${PROJECT_NAME}Setup OPTIONAL) diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake index b178372c60..f69448c14a 100644 --- a/cmake/QtPostProcess.cmake +++ b/cmake/QtPostProcess.cmake @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -include(QtPostProcessHelpers) - qt_internal_create_depends_files() qt_generate_build_internals_extra_cmake_code() qt_internal_create_plugins_auto_inclusion_files() diff --git a/cmake/QtSeparateDebugInfo.cmake b/cmake/QtSeparateDebugInfo.cmake index 5b263585d3..61f62207fa 100644 --- a/cmake/QtSeparateDebugInfo.cmake +++ b/cmake/QtSeparateDebugInfo.cmake @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -include(CMakeFindBinUtils) - if(CMAKE_VERSION VERSION_LESS 3.17.0) set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}) endif() |