summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Unify "wayland components" qt_find_package() callsAlexandru Croitor2020-06-161-8/+0
| | | | | | | | | | | | | | | So that the top-level call in src/CMakeLists.txt finds all the components, rather than doing it separately in each directory. This should prevent issues with dependency tracking of found packages even after the revert of dd7e40b1086020f6a054957f4972720cd6849280 in qtbase which is found at 8ddd3ee60bff1197b251feadf871fdaeb995ef3b. Amends 6319bc72e2dc63175ca797ee3042955f852e008f Change-Id: I05eef9db2de30a61b1aee532edc331b33fc027fb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <hausmann@gmail.com>
* Update dependencies on 'dev' in qt/qtwaylandLiang Qi2020-06-161-2/+1
| | | | | | | | | | | | | | | | | | Remove FontDatabaseSupportPrivate/fontdatabase_support-private in the libraries dependency. The libraries were removed in qtbase in 6be9830d865be32f224e15d13ddefd9c7e176553 and the functionality is now in QtGui. Remove PlatformCompositorSupport mentions, it was removed in qtbase in 7172b5112e5dbf0cb63dec68d2f916a323748aa1, and functionality moved to QtGui. Add explicit package dependency on OpenGL, in case if qtdeclarative modules are missing, so that qtwayland can still be built without qtdeclarative. Change-Id: I5e8ec4cddd293e52c288ba629e6ba954c689a803 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Adapt to moving EventDispatchers to QtGuiFriedemann Kleint2020-06-111-1/+0
| | | | | | Task-number: QTBUG-83255 Change-Id: Iea32600c1d2443c86723653a4fb8b568363cd796 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* CMake: Make ThemeSupport an optional componentAlexandru Croitor2020-06-101-1/+8
| | | | | | | | | | | | | It became an optional component after the qtbase change 788cd98b357fdc9dd8b0f0b1baf1033f0efa1f11 So make it optional. This fixes top-level builds on macOS (and probably other platforms). Amends 09cb3a30900353dea710cf7d614087c0718dce52 Change-Id: I1012923997201673b628a0ee5e512df31228f4cc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Fix top-level build with qtwayland in some casesMårten Nordheim2020-06-091-5/+10
| | | | | | | | | | | | On Windows (at least for me locally) it fails the build because ThemeSupport cannot be found and cmake doesn't know how to build it. This breaks the whole top-level build. In any case this module won't be built on windows because it doesn't pass the preconditions. Also regenerate the top directory CMakeLists.txt Change-Id: Ibf2afb5d7780660cac7944d977097795a6cf5307 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Adapt to FontDatabaseSupport not existing on macOSAlexandru Croitor2020-06-031-1/+1
| | | | | | | | | | | | In qtbase as a result of the a97a8fcc1a9b832fee2ed0e01258e1664a3e3e69 and ce2bc0e2d5b1d647db1e1726ecd434cc8a55accf changes, fontdatabasesupport is not built on macOS anymore. So it's an optional package for wayland now. Change-Id: I4ddd35fa0ec35c91ff92197189f61d4a36e126d5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Regenerate projectsAlexandru Croitor2020-05-261-0/+1
| | | | | Change-Id: I51a365ef29277bfcb3a62d04954dbe109ab6eac7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Adapt to removal of vulkan_support in qtbaseAlexandru Croitor2020-05-261-1/+0
| | | | | | | | | QtVulkanSupport module has been removed and its content was merged into QtGui and QtOpenGL in 7a1650e34331f87bab5a9372087d2a1135f9f63a in qtbase. Change-Id: I33b567208aebfeb15350ea088cb7fcd092e2a48a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/client/xdgoutput/tst_xdgoutput.cpp Regenerated CMake projects. Removed duplicate wayland source in tests/auto/client/xdgoutput/xdgoutput.pro. It's still referenced via the included shared.pri file. Regenerated the CMake project to adapt to that. Otherwise the CMake project fails to configure due to duplicate rules with a error like the one below CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command): Attempt to add a custom rule to output tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule Also use a workaround fix for configuring CMake standalone tests due to regression introduced by dd7e40b1086020f6a054957f4972720cd684 in qtbase. Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
* CMake: Regenerate and adjust projects after mergeAlexandru Croitor2020-03-261-2/+3
| | | | | | | | | | | | | | | Some of the changes that were needed - adjusted wayland macros due to changed target names for plugins - a few direct moc file includes, to get rid of compilation errors - Threads::Threads linking for a few tests - a few special cases for QT_FOR_PRIVATE handling because pro2cmake doesn't handle those correctly at the moment (they map to PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES) - just regenerating all projects Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Initial CMake portJohan Klokkhammer Helsing2019-11-261-0/+44
The client, compositor, tests, plugins and examples now build. There are still a few minor issues: - The protocol source generation is a bit hacky. - The tests for checking if building CMake projects don't work anymore as they have Qt 5 specific code. They have just been commented out for now. Fixes: QTBUG-78177 Change-Id: Ie17cb05f0cdbd5b098970ce765adaeccf61a8fde Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 13:24:56 +0000