aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Fix fuzzer-no-link check for super buildsAlexey Edelev2020-11-191-0/+1
| | | | | | | | | | | | 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>
* CMake: Check module dependency before configureAlexey Edelev2020-11-161-2/+4
| | | | | | | | Move all modules dependency check before actual configuration of any module. Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix dependency handling when module is skippedAlexey Edelev2020-11-141-20/+23
| | | | | | | | | 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>
* Use dependencies.yaml to order sub modulesVolker Hilsheimer2020-11-111-59/+16
| | | | | | | | | | | | | 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>
* CMake: Bump the minimum required CMake version to 3.18Alexandru Croitor2020-11-061-1/+5
| | | | | | | | | 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>
* CMake: Deduplicate qtbase source path referencesAlexandru Croitor2020-11-061-4/+7
| | | | | Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Run auto-detection routines before any project commandJoerg Bornemann2020-10-121-0/+2
| | | | | | | | | | | | | | 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>
* CMake: Fix find_package puzzle piece of top-level cross-buildsJoerg Bornemann2020-10-121-1/+2
| | | | | | | | | | | | | | | | | | | The subdirectories, the top-level CMakeLists.txt adds, contain find_package(Qt6 COMPONENTS ...) calls. When cross-compiling to Android, the toolchain file sets CMAKE_FIND_ROOT_PATH and CMAKE_FIND_ROOT_PATH_MODE to ONLY. That means, the packages that are created in qtbase can never be found by other Qt repositories, e.g. qtdeclarative. Append the qtbase build dir to CMAKE_FIND_ROOT_PATH to find the Qt packages of the build dir when cross-compiling. Because of some CMake idiosyncracy, we need to append "${QtBase_BINARY_DIR}/lib/cmake" to CMAKE_PREFIX_PATH and not just "${QtBase_BINARY_DIR}". See qtbase/ec90f9013b4c6b63d7e03a964f66f97329be7885 for details. Task-number: QTBUG-85080 Change-Id: I799f851316538c310d73f5ab59c809229e16e8a8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Remove ${CMAKE_BINARY_DIR} from CMAKE_PREFIX_PATHJoerg Bornemann2020-10-111-2/+0
| | | | | | | | This is a left-over from before the bin, lib, ... directories were moved to the qtbase build directory. Change-Id: I24bfa36289648288b2b44cc809e0c390cd2c043b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Cmake: Include 3rdparty cmake dependencies in CMAKE_MODULE_PATHDavid Edmundson2020-09-101-0/+2
| | | | | | | | | | | | QtWayland looks for WaylandScanner. If QtBase is installed our CMake find files will be installed and everything will work correctly. If QtBase is not installed yet or out of date, we need to add our source cmake files to the search path. We currently add one of the 3rd party directories, but not the subdirectories. Change-Id: I53ce26b5b21b7e5e74752c730bca90295147f851 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix parsing of .gitmodules to be more robustAlexandru Croitor2020-06-181-8/+10
| | | | | | | | | | | | | | Fix empty lines in .gitmodules, rather than failing to configure with an error message that the line is malformed. Quote all relevant values, to avoid errors that string REGEX does not have enough arguments in cases when the parsed content is malformed. Remove some dead code. Change-Id: I300a76f82fe174290442c659ca2e84391db361a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Read module list from .gitmodulesLeander Beernaert2020-03-181-8/+72
| | | | | | | | | | | | | | | 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>
* Start the CMake superbuildKevin Funk2020-03-181-0/+50
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 22:42:54 +0000