Skip to content
Snippets Groups Projects
Commit 80e97bd0 authored by Fabrice Fontaine's avatar Fabrice Fontaine
Browse files

meson.build: wayland-scanner is only needed for tests


wayland-scanner is only needed for tests so don't require it if tests
are disabled

Signed-off-by: default avatarFabrice Fontaine <fontaine.fabrice@gmail.com>
parent cd153943
No related branches found
No related tags found
Loading
......@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version()
fs = import('fs')
dep_scanner = dependency('wayland-scanner', native: true)
stable_protocols = [
'presentation-time',
'viewporter',
......
prog_scan_sh = find_program('scan.sh')
dep_scanner = dependency('wayland-scanner', native: true)
prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
libwayland = [
......
  • Joshua Watt @jpewhacker ·

    While perhaps true for the CI tests running here, this is not true elsewhere. For example, the yocto project packages tests and Wayland scanner orthogonally. What's the problem you are trying to solve?

  • Owner

    This repo is wayland-protocols, not libwayland. wayland-protocols is just a bunch of XML files.

  • Joshua Watt @jpewhacker ·

    Ah sorry I missed that :(

  • Author Contributor

    This change was needed to avoid the following build failure on buildroot when tests are disabled and host-wayland is not compiled:

    Build-time dependency wayland-scanner found: NO (tried pkgconfig and cmake)
    
    ../output-1/build/wayland-protocols-1.23/meson.build:11:0: ERROR: Dependency "wayland-scanner" not found, tried pkgconfig and cmake

    Full build log: http://autobuild.buildroot.org/results/274/2744e50465a9cd9d3726d23298ad6c943ef49a21/build-end.log

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment