From 4aa1deb9292b0b9ec51ca229fc962091ee4a137e Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 26 Nov 2023 18:31:43 +0200 Subject: [PATCH] meson.build: fix compile with -Dexamples=disabled --- spa/examples/meson.build | 4 ++++ spa/meson.build | 4 +--- src/examples/meson.build | 4 ++++ src/meson.build | 4 +--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/spa/examples/meson.build b/spa/examples/meson.build index 7064a0643..5109c0c7d 100644 --- a/spa/examples/meson.build +++ b/spa/examples/meson.build @@ -6,6 +6,10 @@ spa_examples = [ 'local-v4l2', ] +if not get_option('examples').allowed() + subdir_done() +endif + spa_examples_extra_deps = { 'local-v4l2': [sdl_dep], 'local-libcamera': [sdl_dep, libcamera_dep], diff --git a/spa/meson.build b/spa/meson.build index 27cdd2113..0ee750d6e 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -113,6 +113,4 @@ endif subdir('tools') subdir('tests') -if get_option('examples').allowed() - subdir('examples') -endif +subdir('examples') diff --git a/src/examples/meson.build b/src/examples/meson.build index d0bc3e6fb..dff5e408d 100644 --- a/src/examples/meson.build +++ b/src/examples/meson.build @@ -22,6 +22,10 @@ examples = [ 'local-v4l2', ] +if not get_option('examples').allowed() + subdir_done() +endif + examples_extra_deps = { 'video-src-fixate': [drm_dep], 'video-play': [sdl_dep], diff --git a/src/meson.build b/src/meson.build index cefc329eb..5e5ecc4d5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,9 +3,7 @@ subdir('pipewire') subdir('daemon') subdir('tools') subdir('modules') -if get_option('examples').allowed() - subdir('examples') -endif +subdir('examples') if get_option('tests').allowed() subdir('tests') endif