1berry/qt5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
qt5/CMakeLists.txt

125 lines
4.3 KiB
CMake
Raw Permalink 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 17:41:57 +02:00
# The real minimum version will be checked by the qtbase project.
# 3.16 is the absolute minimum though.
Sync CMake Version with qtbase/CMakeLists.txt Syncing a few hard-coded versions that we have, to all have the upper-bound of 3.21. Change-Id: If8428f850d2df9767a359481db2b7b836843eca5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-24 11:20:22 +02:00
cmake_minimum_required(VERSION 3.16...3.21)
CMake: Deduplicate qtbase source path references Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-02 09:02:58 +01: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 12:02:17 +01: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 17:41:57 +02: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 08:53:35 +01:00
include("${__qt6_qtbase_src_path}/.cmake.conf")
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
include("${__qt6_qtbase_src_path}/cmake/QtBaseTopLevelHelpers.cmake")
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 22:42:18 +02:00
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_setup_autodetect()
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 11:50:41 +02: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 22:42:18 +02: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 12:45:41 +02: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 22:42:18 +02:00
DESCRIPTION "Qt Libraries"
HOMEPAGE_URL "https://qt.io/"
CMake: Don't enable ASM language Enable ASM only for non-Android Unix. Pick-to: 6.5 6.8 6.9 Change-Id: I435ab55f7daf190ce7be5f8eb80b0c1e43b90d94 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-04-30 15:41:54 +02:00
LANGUAGES CXX C
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 22:42:18 +02:00
)
CMake: Don't enable ASM language Enable ASM only for non-Android Unix. Pick-to: 6.5 6.8 6.9 Change-Id: I435ab55f7daf190ce7be5f8eb80b0c1e43b90d94 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-04-30 15:41:54 +02:00
if(UNIX AND NOT ANDROID)
enable_language(ASM)
endif()
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_setup_after_project()
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 22:42:18 +02:00
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_setup_cmake_module_path()
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 22:42:18 +02:00
Remove an unnecessary quotation in loading a CMake module This isn't a variable, so it shouldn't really be necessary, unless I'm missing something. Change-Id: I24c31d1408c1445684b55dd3b87036b57f20b8e4 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-10-19 18:56:19 +02: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 22:42:18 +02:00
include(ECMOptionalAddSubdirectory)
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_before_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 22:42:18 +02:00
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 <alexandru.croitor@qt.io>
2024-03-20 13:39:47 +01:00
qt_internal_find_modules(known_submodules)
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 14:28:12 +01: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 16:18:44 +01:00
if(NOT QT_BUILD_SUBMODULES)
if(DEFINED ENV{QT_BUILD_SUBMODULES})
set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
else()
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 <alexandru.croitor@qt.io>
2024-03-20 13:39:47 +01:00
set(QT_BUILD_SUBMODULES "${known_submodules}")
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 16:18:44 +01: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 14:28:12 +01: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 11:31:50 +02: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 17:04:43 +01:00
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 <alexandru.croitor@qt.io>
2024-03-20 13:39:47 +01:00
# 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()
Show an error when a submodule is missing, or misspelled Stop the configuration and show an error if one of the submodules is missing, or misspelled in `-submodules` option. Pick-to: 6.5 6.6 Fixes: QTBUG-114133 Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
2023-06-02 16:21:02 +02:00
foreach(module IN LISTS QT_BUILD_SUBMODULES)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
message(FATAL_ERROR
"Module '${module}' cannot be found. Please double-check the "
CMake: Integrate init-repository with the configure script Calling configure will now implicitly run init-repository when appropriate. See further down below for what "appropriate" means. All supported init-repository options can be passed to configure as except for -mirror, -oslo, -berlin. This includes useful options like -submodules, -no-resolve-deps and -no-optional-deps. When running configure on a qt5.git clone without any submodules cloned, configure will exit with a helpful error message suggesting to pass -init-submodules, so it automatically clones missing repositories. This means cloning is opt-in, so that internet access is not done implicitly. The error message also suggests passing the -submodules option. This will affect which submodules will be cloned by init-repository and which submodules will be configured by configure. In this case -submodules is effectively an alias of init-repository's -module-subset for cloning purposes. When calling configure a second time, without -init-submodules, on an already configured repo, init-repository behavior is entirely skipped. -submodules now accepts init-repository-style special values like "essential", "addon", "all", "existing", "-deprecated" for the purpose of cloning submodules. The values are then translated into actual repos that should also be configured or skipped by configure. The default subset of cloned submodules is currently the same one as init-repository, "default", which clones 44 actively maintained repositories as well as deprecated submodules. If configure is called a second time WITH -init-submodules, it's the same as calling init-repository --force to re-initialize submodules. In this case passing something like --submodules existing,<additional-submodules> might make sense to add or remove submodules. As a drive-by this also fixes the bug where you couldn't pass a configure -- -DFOO=0 parameter to configure, because it got treated as '0>', redirecting from a different stream than stdout, leading to empty content in the file. [ChangeLog][General][Build System] The configure script now implicitly calls init-repository when appropriate and accepts init-repository command line options. Fixes: QTBUG-120030 Task-number: QTBUG-122622 Change-Id: Iedbfcbf0a87c8ee89e40d00b6377b68296a65a62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-01-29 18:10:42 +01:00
"spelling and try again. Or run\n"
"`./configure -init-submodules -submodules ${module}` "
"to clone the submodule and its dependencies.")
Show an error when a submodule is missing, or misspelled Stop the configuration and show an error if one of the submodules is missing, or misspelled in `-submodules` option. Pick-to: 6.5 6.6 Fixes: QTBUG-114133 Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
2023-06-02 16:21:02 +02:00
endif()
endforeach()
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 <alexandru.croitor@qt.io>
2024-03-20 13:39:47 +01:00
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
SKIP_MODULES ${explicitly_skipped_modules})
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 22:42:18 +02: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 16:18:44 +01: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 13:42:42 +01:00
# Check for unmet dependencies
if(NOT DEFINED BUILD_${module} OR BUILD_${module})
Enable CMAKE_MESSAGE_CONTEXT_SHOW This enables the CMake Message Context across the qt5 repo. Some of the messages were changed from NOTICE to STATUS so that the output looks more coherent and aligned. Change-Id: I4c9104479dd2af31da29cf8cfd20fdc77252d404 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-25 17:03:01 +02:00
message(STATUS "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 14:53:23 +01: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 21:55:08 +01: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 13:42:42 +01: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 14:53:23 +01: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 13:42:42 +01: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 14:53:23 +01: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 13:42:42 +01: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 14:53:23 +01:00
if(NOT error_reason STREQUAL "")
if(required)
Suggest the correct switch to skip repo when configuring Qt Add -DBUILD_<repo>=OFF suggestion for the cases when configuring Qt using CMake and the repo dependecies are missing. Change-Id: Iaa370b49e8fd634bebb7c8300d076165c51dec5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-08 11:22:29 +01:00
if(QT_INTERNAL_CALLED_FROM_CONFIGURE)
set(skip_argument "-skip ${module}")
else()
set(skip_argument "-DBUILD_${module}=OFF")
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 14:53:23 +01:00
message(FATAL_ERROR "Module '${module}' depends on '${dep}', "
"but ${error_reason}.\n"
Suggest the correct switch to skip repo when configuring Qt Add -DBUILD_<repo>=OFF suggestion for the cases when configuring Qt using CMake and the repo dependecies are missing. Change-Id: Iaa370b49e8fd634bebb7c8300d076165c51dec5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-08 11:22:29 +01:00
"Note: Use '${skip_argument}' to exclude it from the build.")
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 14:53:23 +01:00
else()
Enable CMAKE_MESSAGE_CONTEXT_SHOW This enables the CMake Message Context across the qt5 repo. Some of the messages were changed from NOTICE to STATUS so that the output looks more coherent and aligned. Change-Id: I4c9104479dd2af31da29cf8cfd20fdc77252d404 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-25 17:03:01 +02:00
message(STATUS "Skipping optional dependency '${dep}' of '${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 14:53:23 +01:00
"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 13:42:42 +01: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 12:35:31 +01: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 13:42:42 +01:00
Enable CMAKE_MESSAGE_CONTEXT_SHOW This enables the CMake Message Context across the qt5 repo. Some of the messages were changed from NOTICE to STATUS so that the output looks more coherent and aligned. Change-Id: I4c9104479dd2af31da29cf8cfd20fdc77252d404 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-25 17:03:01 +02:00
if(NOT DEFINED CMAKE_MESSAGE_CONTEXT_SHOW)
set(CMAKE_MESSAGE_CONTEXT_SHOW TRUE)
endif()
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 16:18:44 +01:00
foreach(module IN LISTS QT_BUILD_SUBMODULES)
Enable CMAKE_MESSAGE_CONTEXT_SHOW This enables the CMake Message Context across the qt5 repo. Some of the messages were changed from NOTICE to STATUS so that the output looks more coherent and aligned. Change-Id: I4c9104479dd2af31da29cf8cfd20fdc77252d404 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-25 17:03:01 +02:00
message(STATUS "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 14:28:12 +01: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 22:42:18 +02:00
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_after_add_subdirectory()
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 17:04:43 +01:00
endforeach()
CMake: Move some code back into qtbase It's somewhat painful to do changes in the top-level CMakeLists.txt in regards to calling qtbase commands, because the file needs to be compatible with different qtbase sha1s while the submodule update catches up with a new qtbase to be used for qt5.git. Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to to move some responsibility back to qtbase. This way we can hopefully avoid some churn and do direct changes in qtbase instead. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-08-28 12:12:43 +02:00
qt_internal_top_level_end()
Reference in New Issue Copy Permalink