diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-04-02 16:04:13 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-04-02 16:04:13 +0200 |
| commit | b867488442d4974d226bda602aa10ea3100ba1a3 (patch) | |
| tree | 53027d9341ac686974ef03d6a290394411725557 | |
| parent | 64ac7b47b81549bce8911422209c81b77a9232ba (diff) | |
Fix "recipe for target '../../src/xdg-decoration-protocol.c' failed" (#704)
| -rw-r--r-- | CMake/options.cmake | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index 392cb5cd6..ce406ba92 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -215,13 +215,13 @@ if (UNIX) option (OPTION_USE_WAYLAND "support both Wayland and X11 backends" ON) endif (NOT APPLE) if (OPTION_USE_WAYLAND) - pkg_check_modules(WLDCLIENT wayland-client) + pkg_check_modules(WLDCLIENT wayland-client>=1.18) pkg_check_modules(WLDCURSOR wayland-cursor) - pkg_check_modules(WLDPROTO wayland-protocols) + pkg_check_modules(WLDPROTO wayland-protocols>=1.15) pkg_check_modules(XKBCOMMON xkbcommon) pkg_check_modules(DBUS dbus-1) if (NOT(DBUS_FOUND AND WLDCLIENT_FOUND AND WLDCURSOR_FOUND AND WLDPROTO_FOUND AND XKBCOMMON_FOUND)) - message (STATUS "Not all software modules 'wayland-client wayland-cursor wayland-protocols xkbcommon dbus-1' are present") + message (STATUS "Not all software modules 'wayland-client>=1.18 wayland-cursor wayland-protocols>=1.15 xkbcommon dbus-1' are present") message (STATUS "Consequently, OPTION_USE_WAYLAND is set to OFF.") unset (OPTION_USE_WAYLAND CACHE) set (OPTION_USE_WAYLAND 0) diff --git a/configure.ac b/configure.ac index b2de8abd6..893d0aa16 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,14 +1007,14 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [ ]) ],[ missing="no" - AS_IF([$PKGCONFIG --exists wayland-client],[],[missing="yes"]) - AS_IF([$PKGCONFIG --exists wayland-protocols],[],[missing="yes"]) + AS_IF([$PKGCONFIG --exists 'wayland-client >= 1.18'],[],[missing="yes"]) + AS_IF([$PKGCONFIG --exists 'wayland-protocols >= 1.15'],[],[missing="yes"]) AS_IF([$PKGCONFIG --exists wayland-cursor],[],[missing="yes"]) AS_IF([$PKGCONFIG --exists xkbcommon],[],[missing="yes"]) AS_IF([$PKGCONFIG --exists dbus-1],[],[missing="yes"]) AS_IF([$PKGCONFIG --exists pangocairo],[],[missing="yes"]) AS_IF([test x$missing = xyes], [ - AC_MSG_WARN([These packages 'wayland-client wayland-protocols wayland-cursor xkbcommon dbus-1 pangocairo' are required to build FLTK for wayland.]) + AC_MSG_WARN([These packages 'wayland-client>=1.18 wayland-protocols>=1.15 wayland-cursor xkbcommon dbus-1 pangocairo' are required to build FLTK for wayland.]) AC_MSG_WARN([At least one of them is missing.]) AS_IF([test x$enable_wayland = xyes], [ AC_MSG_ERROR([Building for Wayland is not possible. Aborting.]) |