From 34be87a3f62f5807779c738ee7ef81d6fa5d1b00 Mon Sep 17 00:00:00 2001 From: "florian.weigelt" Date: Sat, 5 May 2018 09:40:02 +0200 Subject: [PATCH 1/2] Add option to disable rootston build Compiling the rootston example compositor is useful for testing and development, but less useful for actual users of wlroots, who might prefer sway or other compositors. This commit adds the option --enable-rootston to set weather to include rootston at compilation or not. The default value is True, so the current compilation behaviour remains unchanged. --- meson.build | 5 ++++- meson_options.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 19d334e3..78cfc858 100644 --- a/meson.build +++ b/meson.build @@ -201,7 +201,10 @@ summary = [ message('\n'.join(summary)) -subdir('rootston') +if get_option('enable-rootston') + subdir('rootston') +endif + subdir('examples') pkgconfig = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt index de29e401..df322f39 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,3 +4,4 @@ option('enable-elogind', type: 'combo', choices: ['auto', 'true', 'false'], valu option('enable-xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library') option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications') option('enable-x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend') +option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor') From d68a27fd79e1ddadbdf63d734ae04a7a8983dabc Mon Sep 17 00:00:00 2001 From: "florian.weigelt" Date: Sat, 5 May 2018 09:50:10 +0200 Subject: [PATCH 2/2] Add option to disable examples build Compiling the examples is useful for testing and development, but less useful for actual users of wlroots. This commit adds the option --enable-examples to set weather to include the examples at compilation or not. The default value is True, so the current behaviour remains unchanged. --- meson.build | 4 +++- meson_options.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 78cfc858..362de9f6 100644 --- a/meson.build +++ b/meson.build @@ -205,7 +205,9 @@ if get_option('enable-rootston') subdir('rootston') endif -subdir('examples') +if get_option('enable-examples') + subdir('examples') +endif pkgconfig = import('pkgconfig') pkgconfig.generate( diff --git a/meson_options.txt b/meson_options.txt index df322f39..e474b8aa 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,3 +5,4 @@ option('enable-xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], v option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications') option('enable-x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend') option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor') +option('enable-examples', type: 'boolean', value: true, description: 'Build example applications')