summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-01-21 10:36:12 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-21 12:09:06 +0000
commit13947bd24bb7dd83a31285bf3c41a56244d0e0ef (patch)
tree9ac30680777a7aee78d9d07a93b771d4db205019
parent8aa723004d290be76670c7f2ab26a21b0d64ec06 (diff)
downloadqtwayland-13947bd24bb7dd83a31285bf3c41a56244d0e0ef.tar.gz
CMake: Ensure qt_cmdline.cmake files exist for each configure.cmake
Otherwise the configure script won't understand command line options like -no-feature-egl-extension-platform-wayland because the subdirectory configure.cmake files are only loaded by the configure script when there are accompanying qt_cmdline.cmake files. Fixes: QTBUG-99802 Change-Id: Ifd6ea6f366ac5fe09a9eafe3be7d889044caa52f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 528d63b9abdffa52fb064cdc129660ca94ed4225) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--qt_cmdline.cmake2
-rw-r--r--src/client/qt_cmdline.cmake0
-rw-r--r--src/compositor/qt_cmdline.cmake0
3 files changed, 2 insertions, 0 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
index 7151714f..e74a6c8f 100644
--- a/qt_cmdline.cmake
+++ b/qt_cmdline.cmake
@@ -1 +1,3 @@
qt_commandline_subconfig(src)
+qt_commandline_subconfig(src/client)
+qt_commandline_subconfig(src/compositor)
diff --git a/src/client/qt_cmdline.cmake b/src/client/qt_cmdline.cmake
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/client/qt_cmdline.cmake
diff --git a/src/compositor/qt_cmdline.cmake b/src/compositor/qt_cmdline.cmake
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/compositor/qt_cmdline.cmake