summaryrefslogtreecommitdiffstats
path: root/qt_cmdline.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Support more module flags for 'configure' scriptKirill Burtsev2021-09-141-0/+3
| | | | | | | | | | | | Support flags passed to main 'configure' and separate 'qt-configure-module' scripts with flags like '-no-build-qtpdf', '-webengine-full-debug-info', '-no-webengine-jumbo-build', etc. Fixes: QTBUG-95717 Change-Id: Ia12602e9a9b31f4f2256f983f6c1e3fbe50cb9e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 518d4f10dadf0dcf812a6b949c8febdb0bb93a58)
* Make configure -list-features workJoerg Bornemann2021-09-141-0/+1
To list features, qtbase's QtProcessConfigureArgs.cmake must include the configure.cmake files. It includes all configure.cmake files that are in directories that are registered with qt_commandline_subconfig in the repository's top-level qt_cmdline.cmake. Add such a qt_cmdline.cmake files and add only src/core/api, because its configure.cmake is the only one that lists public features. Guard find_package calls in that configure.cmake such that they are not executed when configure's initial feature gathering phase is run. Fixes: QTBUG-96196 Change-Id: If61774f467c4df6138f9b63c4c1326a561178af6 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b35697e8e9d12532a7a820ebd90efc460f84b421) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>