From b35697e8e9d12532a7a820ebd90efc460f84b421 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 Sep 2021 11:35:19 +0200 Subject: 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 --- qt_cmdline.cmake | 1 + 1 file changed, 1 insertion(+) create mode 100644 qt_cmdline.cmake (limited to 'qt_cmdline.cmake') 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) -- cgit v1.2.1