diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-24 14:24:25 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-25 15:43:16 +0100 |
commit | 160184d6a5d0b89d9b885581f2d93a5650eede0a (patch) | |
tree | 4be4da03488b16080c484ec33bd38864569139f8 /src/platformsupport | |
parent | 8ab59fd8b358f6aee94b5b2907209170b28acaca (diff) |
CMake: Fix X11 and xkb library usage in the platform projects
This is a prerequisite for building the bundled 3rd party libraries.
Because the feature evaluation will be moved into src/CMakeLists.txt,
some of the X11 packages were found in the src dir, and then a second
time inside the x11-related projects.
These qt_find_package calls in the x11 related projects tried to
promote the imported targets to global, which failed, because they were
created in a different directory scope.
To avoid this, the special case qt_find_package calls are removed from
the nested projects.
Also, fix the mapping of some of the x11 libraries to be correct
- xkbcommon_x11 was incorrectly mapped to XKB::XKB instead of the
xkb common x11 library
- xlib was mapped to xcb, whereas X11 is the correct CMake target
Change-Id: I30781b2ecbdd478c98419b14baa0492037e49c61
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/platformsupport')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt index f8efacd7cb..c00cc30d62 100644 --- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt @@ -36,7 +36,7 @@ qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11 SOURCES qxlibeglintegration.cpp qxlibeglintegration_p.h LIBRARIES - X11::XCB + X11::X11 ) qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11 diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt index b18a1470ec..1858dc7e90 100644 --- a/src/platformsupport/eglconvenience/CMakeLists.txt +++ b/src/platformsupport/eglconvenience/CMakeLists.txt @@ -39,7 +39,7 @@ qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11 SOURCES qxlibeglintegration.cpp qxlibeglintegration_p.h LIBRARIES - X11::XCB + X11::X11 ) qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11 diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt index f9a2fed5b2..d3d2c87910 100644 --- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ qt_add_module(GlxSupport PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - X11::XCB + X11::X11 ) #### Keys ignored in scope 1:.:.:glxconvenience.pro:<TRUE>: diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt index 00bc78d429..00d2e6c754 100644 --- a/src/platformsupport/glxconvenience/CMakeLists.txt +++ b/src/platformsupport/glxconvenience/CMakeLists.txt @@ -16,7 +16,7 @@ qt_add_module(GlxSupport PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - X11::X11 # special case + X11::X11 ) #### Keys ignored in scope 1:.:.:glxconvenience.pro:<TRUE>: |