diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-14 15:13:35 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-15 10:40:52 +0200 |
| commit | 488ce1ce371921c891423f54557f66aacd00fb0f (patch) | |
| tree | d961cf5df9744af12ceb0b5fb48f1095782e06bc | |
| parent | dfaf374a3d8d34b9aa90bfc4c5e074f9fd8b9981 (diff) | |
CMake: Explicitly search for X11 with proper dependency tracking
Replace the hardcoded find_package(X11) with qt_find_package in both the
compositor and client projects.
This should ensure proper dependency tracking.
Calling qt_find_package(X11) is now necessary, because QtGui doesn't
publically link against X11 anymore, which means we have to do it
explicitly for qtwayland. The relevant qtbase change is
69004cb2900dcfc530e1e2efb783f559661a8a50
The calls need to be protected by an if(NOT TARGET) to prevent
configuration issues in static builds, where the dependency does get
propagated.
This amends commit dfaf374a3d8d34b9aa90bfc4c5e074f9fd8b9981.
Change-Id: Ia39e1e78cd0af386d7b48cd1922887289823c1fa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/client/configure.cmake | 9 | ||||
| -rw-r--r-- | src/compositor/configure.cmake | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 54d9b68e2..e72c5e1c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ project(QtWayland # special case # TODO: Fix warnings and remove this set(QT_REPO_NOT_WARNINGS_CLEAN TRUE) -find_package(X11) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals ) diff --git a/src/client/configure.cmake b/src/client/configure.cmake index 2310ba8da..6e6b0f33d 100644 --- a/src/client/configure.cmake +++ b/src/client/configure.cmake @@ -17,7 +17,14 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Wayland PROVIDED_TARGETS Wayland::Egl MODULE_NAME waylandclient QMAKE_LIB wayland-egl) endif() qt_find_package(XComposite PROVIDED_TARGETS PkgConfig::XComposite MODULE_NAME waylandclient QMAKE_LIB xcomposite) - +# special case begin +# X11 is not a public dependency of QtGui anymore, so we need to find it manually in a shared build. +# In a static build the dependency is still propagated, so check for the target existence to prevent +# the 'Attempt to promote imported target "X11::X11" to global scope' issue. +if(NOT TARGET X11::X11) + qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) +endif() +# special case end #### Tests diff --git a/src/compositor/configure.cmake b/src/compositor/configure.cmake index 6d0d89835..731213178 100644 --- a/src/compositor/configure.cmake +++ b/src/compositor/configure.cmake @@ -16,6 +16,13 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Waylandkms PROVIDED_TARGETS PkgConfig::Waylandkms MODULE_NAME waylandcompositor QMAKE_LIB wayland-kms) endif() qt_find_package(XComposite PROVIDED_TARGETS PkgConfig::XComposite MODULE_NAME waylandcompositor QMAKE_LIB xcomposite) +# special case begin +# X11 is not a public dependency of QtGui anymore, so we need to find it manually in a shared build. +# In a static build the dependency is still propagated, so check for the target existence to prevent +# the 'Attempt to promote imported target "X11::X11" to global scope' issue. +if(NOT TARGET X11::X11) + qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) +endif() #### Tests |