diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-27 04:54:35 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-27 12:22:07 +0300 |
| commit | cbab734445060e4dc39a37a7164282910a8fad11 (patch) | |
| tree | 8068412b77d76559fd2bde9a91a5db5902b7f2b3 /build_files/cmake | |
| parent | 5f6d66c1c5f4a704d73a0aed8d13af53cf09bb52 (diff) | |
Build: add wayland to deps build
This is needed to ensure and up to date "wayland-scanner" is used,
as versions before 1.20.0 generate headers incompatible with
dynamic linking (WITH_GHOST_WAYLAND_DYNLOAD).
As the centos7 version of wayland is 1.15 so make this part of Blender's
dependencies on Linux.
We intend to enable Wayland for Blender 3.4 release, this is needed for
the build-bot.
Reviewed By: brecht
Ref D16074
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index f640f7f7650..6ad4547fa00 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -764,7 +764,11 @@ if(WITH_GHOST_WAYLAND) add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR) endif() - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + if(EXISTS "${LIBDIR}/wayland/bin/wayland-scanner") + set(WAYLAND_SCANNER "${LIBDIR}/wayland/bin/wayland-scanner") + else() + pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + endif() # When using dynamic loading, headers generated # from older versions of `wayland-scanner` aren't compatible. |