qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qt5/CMakeLists.txt

114 lines
4.0 KiB
CMake
Raw Normal View History

CMake: Remove CMake minimum version check in top-level project The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-21 15:41:57 +00:00
# The real minimum version will be checked by the qtbase project.
# 3.16 is the absolute minimum though.
cmake_minimum_required(VERSION 3.16...3.20)
CMake: Deduplicate qtbase source path references Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-02 08:02:58 +00:00
Set QT_SUPERBUILD early That will allow qtbase's .cmake.conf to check whether it is meant to be used in a superbuild or only for qtbase. Task-number: QTBUG-101640 Pick-to: 6.2 6.3 Change-Id: I035c86f32497004cc1b8441456604106bacadad4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-03-18 11:02:17 +00:00
# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
set(QT_SUPERBUILD TRUE)
CMake: Remove CMake minimum version check in top-level project The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-21 15:41:57 +00:00
# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
CMake: Bump the minimum required CMake version to 3.18 This is the top-level counterpart change that uses the infra introduced in qtbase. Task-number: QTBUG-88086 Change-Id: I2524cd88da43cffb2b3742caedd1cd2f3130dff5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-02 07:53:35 +00:00
include("${__qt6_qtbase_src_path}/.cmake.conf")
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
CMake: Remove CMake minimum version check in top-level project The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-21 15:41:57 +00:00
# Run platform auto-detection /before/ the first project() call and thus
# before the toolchain file is loaded.
CMake: Deduplicate qtbase source path references Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-02 08:02:58 +00:00
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
CMake: Run auto-detection routines before any project command This is needed to ensure that the auto-detection runs before any toolchain file is loaded, like in a stand-alone qtbase build. This fixes the issue that we had to specify ANDROID_STL=c++_shared in a top-level build, even though it's properly defaulted in QtAutoDetect.cmake. Task-number: QTBUG-87309 Change-Id: I8ced2213ca2e5a877bfd210e59da4ef4d6c8ac74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-09 09:50:41 +00:00
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
project(Qt
CMake: Use qtbase's version as the top-level project version This avoids the need to bump the qt5.git project version when branching the next minor Qt version. Pick-to: 6.1 6.0 Task-number: QTBUG-92861 Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-15 10:45:41 +00:00
VERSION "${QT_REPO_MODULE_VERSION}"
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
DESCRIPTION "Qt Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM
)
# Required so we can call ctest from the root build directory
enable_testing()
Read module list from .gitmodules This patch mimics the behavior of qt.pro, where the module list is extracted from the .gitmodules file and then topologically sorted based on the modules dependencies. This patch also introduces a small check to make sure all the required dependencies are met and will be built. Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b01225fb3257fa4c26d364c9a8fe5e19a04039e3) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-01-08 16:04:43 +00:00
set(qt_module_prop_prefix "__qt_prop_")
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if (NOT QT_BUILD_STANDALONE_TESTS)
CMake: Deduplicate qtbase source path references Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-02 08:02:58 +00:00
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
list(APPEND CMAKE_MODULE_PATH
"${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
endif()
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
include("QtTopLevelHelpers")
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
include(ECMOptionalAddSubdirectory)
# Also make sure the CMake config files do not recreate the already-existing targets
if (NOT QT_BUILD_STANDALONE_TESTS)
set(QT_NO_CREATE_TARGETS TRUE)
endif()
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
# Get submodule list if not already defined
cmake: Allow specifying list of submodules using environment The variable now has a QT prefix to make it less likely to clash with other environment variables. For simplicity we use the same variable name internally. Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-16 15:18:44 +00:00
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)
endif()
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
endif()
Cache list of submodules Otherwise running cmake with QT_BUILD_SUBMODULES set in the environment would not persist for later cmake runs without the environment set, resulting in trying to reconfigure with every single available module. Change-Id: I85e57b16fdc8e51cae8fff083c7a7536b0ed16f1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 09:31:50 +00:00
set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
Read module list from .gitmodules This patch mimics the behavior of qt.pro, where the module list is extracted from the .gitmodules file and then topologically sorted based on the modules dependencies. This patch also introduces a small check to make sure all the required dependencies are met and will be built. Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b01225fb3257fa4c26d364c9a8fe5e19a04039e3) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-01-08 16:04:43 +00:00
CMake: Rework inter-repository dependency resolution In certain cases the dependency resolution between Qt repositories resulted in a wrong order, for example qtsvg being handled before qtbase. See the linked task for an example. Replace the existing algorithm with a post-order traversal of the dependency graph to produce a topological ordering. Rename qt_internal_add_module_dependencies to qt_internal_resolve_module_dependencies and remove unnecessary positional arguments. Use keyword arguments for a nicer API. Raise the cmake_policy in QtSynchronizeRepo.cmake to avoid policy warnings we now would get due to the use of IN_LIST. Fixes: QTBUG-98268 Change-Id: I1425fd9c802fa71ae42549ceb14bcfc4c0a62078 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-01-21 20:55:08 +00:00
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
cmake: Allow specifying list of submodules using environment The variable now has a QT prefix to make it less likely to clash with other environment variables. For simplicity we use the same variable name internally. Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-16 15:18:44 +00:00
foreach(module IN LISTS QT_BUILD_SUBMODULES)
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
# Check for unmet dependencies
if(NOT DEFINED BUILD_${module} OR BUILD_${module})
CMake: Normalize submodule names by stripping tqtc- prefixes In tqtc repos, the dependencies.yaml files may point to tqtc- prefixed repos, which can lead to build failures when doing a top-level build and the local repo directory names have no tqtc- prefix. This is the case both in the CI, and when using init-repository or git submodule init --recursive, because qt5.git specifies the 'path' key for each submodule to not contain any tqtc- prefix. Normalize the repo names by removing the tqtc- prefix when doing dependency resolution for CMake add_subdirectory calls, if such a submodule name does not exist on-disk. The normalization is conditional, to allow inclusion of repos that don't have a non-tqtc mirror. qt_internal_sync_to and the other git related operations are currently broken (both before and after this change) when used in conjunction with tqtc- repos and is non-trivial to fix. The first problem is the assumption of using the 'origin' remote, which will likely be an open-source repo that doesn't contain any tqtc repos. The second problem is that we would need to agree upon requiring 2 remotes, one open source and one tqtc one, to reliably choose where to clone / fetch from, as well as determining whether the checked out repo name needs to have a tqtc- prefix (by checking whether the repo does not exist in the open source remote for commercial only repos). Alternatively we could hard code a list of known open source repos, and anything not in the list will have its tqtc- prefix kept, but we still need to know which remote to use. As a drive-by, adjusted some of the shown messages for better readability and easier grepping. Pick-to: 6.2 6.3 Fixes: QTBUG-102883 Change-Id: I6806b119dd32b14dc0d9711dc829bfc5130d1e6f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-26 16:02:09 +00:00
message(NOTICE "Checking dependencies of submodule '${module}'")
Do not error out on missing optional repository dependencies Read the 'required' value from dependencies.yaml and store all required dependencies of repository 'qtfoo' in a global property QT_REQUIRED_DEPS_FOR_qtfoo. Check this property in the top-level CMakeLists.txt and only print informational messages instead of errors for optional dependencies. Fixes: QTBUG-91144 Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 13:53:23 +00:00
get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
CMake: Rework inter-repository dependency resolution In certain cases the dependency resolution between Qt repositories resulted in a wrong order, for example qtsvg being handled before qtbase. See the linked task for an example. Replace the existing algorithm with a post-order traversal of the dependency graph to produce a topological ordering. Rename qt_internal_add_module_dependencies to qt_internal_resolve_module_dependencies and remove unnecessary positional arguments. Use keyword arguments for a nicer API. Raise the cmake_policy in QtSynchronizeRepo.cmake to avoid policy warnings we now would get due to the use of IN_LIST. Fixes: QTBUG-98268 Change-Id: I1425fd9c802fa71ae42549ceb14bcfc4c0a62078 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-01-21 20:55:08 +00:00
get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
foreach(dep IN LISTS dependencies)
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
if (dep STREQUAL "qtbase")
# Always available skip
continue()
endif()
Do not error out on missing optional repository dependencies Read the 'required' value from dependencies.yaml and store all required dependencies of repository 'qtfoo' in a global property QT_REQUIRED_DEPS_FOR_qtfoo. Check this property in the top-level CMakeLists.txt and only print informational messages instead of errors for optional dependencies. Fixes: QTBUG-91144 Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 13:53:23 +00:00
set(required FALSE)
if(dep IN_LIST required_deps)
set(required TRUE)
endif()
set(error_reason "")
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dep}/CMakeLists.txt")
Do not error out on missing optional repository dependencies Read the 'required' value from dependencies.yaml and store all required dependencies of repository 'qtfoo' in a global property QT_REQUIRED_DEPS_FOR_qtfoo. Check this property in the top-level CMakeLists.txt and only print informational messages instead of errors for optional dependencies. Fixes: QTBUG-91144 Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 13:53:23 +00:00
set(error_reason "${dep}'s CMakeLists.txt couldn't be found")
elseif(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
set(error_reason "building '${dep}' was explicitly disabled")
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
endif()
Do not error out on missing optional repository dependencies Read the 'required' value from dependencies.yaml and store all required dependencies of repository 'qtfoo' in a global property QT_REQUIRED_DEPS_FOR_qtfoo. Check this property in the top-level CMakeLists.txt and only print informational messages instead of errors for optional dependencies. Fixes: QTBUG-91144 Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 13:53:23 +00:00
if(NOT error_reason STREQUAL "")
if(required)
message(FATAL_ERROR "Module '${module}' depends on '${dep}', "
"but ${error_reason}.\n"
"Note: Use '-skip ${module}' to exclude it from the build.")
else()
message(NOTICE "Skipping optional dependency '${dep}' of '${module}', "
"because ${error_reason}.")
endif()
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
endif()
endforeach()
endif()
CMake: Check module dependency before configure Move all modules dependency check before actual configuration of any module. Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-16 11:35:31 +00:00
endforeach()
CMake: Fix dependency handling when module is skipped Put dependencies of all modules to top-level variables and check for unmet dependencies before module configuring. Fixes: QTBUG-88214 Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-13 12:42:42 +00:00
cmake: Allow specifying list of submodules using environment The variable now has a QT prefix to make it less likely to clash with other environment variables. For simplicity we use the same variable name internally. Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-16 15:18:44 +00:00
foreach(module IN LISTS QT_BUILD_SUBMODULES)
CMake: Normalize submodule names by stripping tqtc- prefixes In tqtc repos, the dependencies.yaml files may point to tqtc- prefixed repos, which can lead to build failures when doing a top-level build and the local repo directory names have no tqtc- prefix. This is the case both in the CI, and when using init-repository or git submodule init --recursive, because qt5.git specifies the 'path' key for each submodule to not contain any tqtc- prefix. Normalize the repo names by removing the tqtc- prefix when doing dependency resolution for CMake add_subdirectory calls, if such a submodule name does not exist on-disk. The normalization is conditional, to allow inclusion of repos that don't have a non-tqtc mirror. qt_internal_sync_to and the other git related operations are currently broken (both before and after this change) when used in conjunction with tqtc- repos and is non-trivial to fix. The first problem is the assumption of using the 'origin' remote, which will likely be an open-source repo that doesn't contain any tqtc repos. The second problem is that we would need to agree upon requiring 2 remotes, one open source and one tqtc one, to reliably choose where to clone / fetch from, as well as determining whether the checked out repo name needs to have a tqtc- prefix (by checking whether the repo does not exist in the open source remote for commercial only repos). Alternatively we could hard code a list of known open source repos, and anything not in the list will have its tqtc- prefix kept, but we still need to know which remote to use. As a drive-by, adjusted some of the shown messages for better readability and easier grepping. Pick-to: 6.2 6.3 Fixes: QTBUG-102883 Change-Id: I6806b119dd32b14dc0d9711dc829bfc5130d1e6f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-26 16:02:09 +00:00
message(NOTICE "Configuring submodule '${module}'")
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
ecm_optional_add_subdirectory("${module}")
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
if(module STREQUAL "qtbase")
if (NOT QT_BUILD_STANDALONE_TESTS)
CMake: Take custom libdir into account When configuring with -libdir set to something that is not recognized by CMake's find_package search procedure, top-level builds failed to configure. This was due to a hard-coded lib/cmake directory added to CMAKE_PREFIX_PATH. Fixes: QTBUG-103823 Pick-to: 6.2 6.3 6.4 Change-Id: If8b48e35e654089f32cbe4af9936238cd82b3dbb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-06-13 09:25:34 +00:00
list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake")
Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 13:28:12 +00:00
list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
endif()
endif()
Read module list from .gitmodules This patch mimics the behavior of qt.pro, where the module list is extracted from the .gitmodules file and then topologically sorted based on the modules dependencies. This patch also introduces a small check to make sure all the required dependencies are met and will be built. Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b01225fb3257fa4c26d364c9a8fe5e19a04039e3) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-01-08 16:04:43 +00:00
endforeach()
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
if(NOT QT_BUILD_STANDALONE_TESTS)
# Display a summary of everything
include(QtBuildInformation)
CMake: Fix fuzzer-no-link check for super builds Add platform detection before report enties evaluation in root CMakeLists.txt. QtPlatformSupport.cmake defines required platform-specific variables line CLANG before qt_configure_eval_commands call. Fixes: QTBUG-88496 Change-Id: I13afdbe29f2bffeb2c36c17e231b98b2aa2b41e6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2020-11-19 11:19:39 +00:00
include(QtPlatformSupport)
Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 7509458d5f1ed5a48285471e32eda333cc3eeb8c) Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 20:42:18 +00:00
qt_print_feature_summary()
qt_print_build_instructions()
endif()