diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-03 11:35:19 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-07 00:25:07 +0200 |
| commit | b35697e8e9d12532a7a820ebd90efc460f84b421 (patch) | |
| tree | 7e4883f6b4f0e8dda1ddcfb24095d8434d2ea77b /qt_cmdline.cmake | |
| parent | f69c402f2406653819e646e2ec76bf12d1f3b09e (diff) | |
| download | qtwebengine-b35697e8e9d12532a7a820ebd90efc460f84b421.tar.gz | |
Make configure -list-features work
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.
Pick-to: 6.2
Fixes: QTBUG-96196
Change-Id: If61774f467c4df6138f9b63c4c1326a561178af6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'qt_cmdline.cmake')
| -rw-r--r-- | qt_cmdline.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake new file mode 100644 index 000000000..7ee72a727 --- /dev/null +++ b/qt_cmdline.cmake @@ -0,0 +1 @@ +qt_commandline_subconfig(src/core/api) |