mirror of https://github.com/fltk/fltk
Fix "recipe for target '../../src/xdg-decoration-protocol.c' failed" (#704)
This commit is contained in:
parent
64ac7b47b8
commit
b867488442
|
@ -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)
|
||||
|
|
|
@ -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.])
|
||||
|
|
Loading…
Reference in New Issue