Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-08-29 19:59:46 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-08-29 20:51:07 +0300
commit7fbf72f148dc9eada86cfcb345310c98f76962b8 (patch)
treed8d587a687f09c25b0847ad87abb809d73bf7209 /intern/ghost
parent74caf773619bbf6a0f95c598b66261a6bef392ee (diff)
Build: automatically disable WITH_GHOST_WAYLAND if missing libraries
Same as other build options, don't make it a hard requirement to have Wayland libraries installed when it gets enabled by default. Also fixes wayland-protocols not being found on the buildbot.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/CMakeLists.txt16
1 files changed, 0 insertions, 16 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index f6851b67681..f2e6609a263 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -303,22 +303,6 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
intern/GHOST_WaylandUtils.h
)
- pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-
- pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
- if(${wayland-protocols_FOUND})
- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
- else()
- find_path(WAYLAND_PROTOCOLS_DIR
- NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
- PATH_SUFFIXES share/wayland-protocols
- )
- endif()
-
- if(NOT EXISTS ${WAYLAND_PROTOCOLS_DIR})
- message(FATAL_ERROR "path to wayland-protocols not found")
- endif()
-
set(INC_DST ${CMAKE_CURRENT_BINARY_DIR}/libwayland)
# Generate protocols bindings.