diff options
| author | Niclas Rosenvik <nros@netbsd.org> | 2021-02-26 10:25:37 +0000 |
|---|---|---|
| committer | Niclas Rosenvik <nros@netbsd.org> | 2021-03-16 13:05:17 +0000 |
| commit | 05e4c8f2e9821a2d193087ad67264c817e9414c5 (patch) | |
| tree | 9a37eb9e89dd2686b931f5c0c234e45cf84ea346 /util/cmake | |
| parent | 0bd705d91bc7a883a90abf3a6a6f638301fe2f75 (diff) | |
Enable X11 on other platforms than just Linux
Set CMake variable X11_SUPPORTED for all systems that have X11.
Adjust _adjust_library_map() in util/cmake/helper.py to apply X11_SUPPORTED
condition around X11 related packages instead of just LINUX.
Adjust configure.cmake in src/gui based on this change.
Why, because X11 is not just Linux.
Change-Id: Ic3c04eaa55301d1237c7e74281eccd4f8e27e9ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake')
| -rw-r--r-- | util/cmake/helper.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index f04d198dab..7895019519 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -630,14 +630,18 @@ _library_map = [ def _adjust_library_map(): - # Assign a Linux condition on all x and wayland related packages. + # Assign a Linux condition on all wayland related packages. + # Assign platforms that have X11 condition on all X11 related packages. # We don't want to get pages of package not found messages on # Windows and macOS, and this also improves configure time on # those platforms. - linux_package_prefixes = ["xcb", "x11", "xkb", "xrender", "xlib", "wayland"] + linux_package_prefixes = ["wayland"] + x11_package_prefixes = ["xcb", "x11", "xkb", "xrender", "xlib"] for i, _ in enumerate(_library_map): if any([_library_map[i].soName.startswith(p) for p in linux_package_prefixes]): _library_map[i].emit_if = "config.linux" + if any([_library_map[i].soName.startswith(p) for p in x11_package_prefixes]): + _library_map[i].emit_if = "X11_SUPPORTED" _adjust_library_map() |