From ebbdaa168c0ff947d3b068062f7bf12f7b76d0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20L=2E=20Treffenst=C3=A4dt?= Date: Fri, 2 Nov 2018 23:15:42 +0100 Subject: [PATCH] automatically detect where filesystem lives --- meson.build | 6 +++++- meson_options.txt | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f0472b85..547714e2 100644 --- a/meson.build +++ b/meson.build @@ -83,7 +83,11 @@ if dbusmenu_gtk.found() ) endif -if get_option('filesystem-experimental') +test_fs = '''#include +int main(void){}''' +compiler = meson.get_compiler('cpp') + +if not compiler.compiles(test_fs, name : 'is filesystem still in experimental?') add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp') endif diff --git a/meson_options.txt b/meson_options.txt index 17825ac5..67fa5472 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,4 +2,3 @@ option('libnl', type: 'feature', value: 'auto', description: 'Enable libnl suppo option('pulseaudio', type: 'feature', value: 'auto', description: 'Enable support for pulseaudio') option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray') option('out', type: 'string', value : '/', description: 'output prefix directory') -option('filesystem-experimental', type: 'boolean', value: 'true', description: 'Does filesystem still live in experimental?')