diff options
author | Benjamin Otte <otte@redhat.com> | 2021-04-01 21:29:41 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-07-20 14:00:25 -0400 |
commit | af0c95c11a5039967cdeb6101ec467ac75f1ccfb (patch) | |
tree | f34b8ab2c683207853a050dd05a8df4bb2b91b90 /gtk | |
parent | 4d5dc18a575ce76b5f2469832c8d0d805b355bd9 (diff) | |
download | gtk+-af0c95c11a5039967cdeb6101ec467ac75f1ccfb.tar.gz |
build: Remove sassc option
Instead, ensure that sassc is made madatory on git builds (because
it is, we don't ship CSS files anymore) and not even looked for in
release builds (because do ship CSS files there).
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/meson.build | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gtk/meson.build b/gtk/meson.build index b42d793c86..bf108df11a 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -839,23 +839,25 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml', ], ) -# Build the theme files -sassc = find_program('sassc', required: false) -if not sassc.found() and not get_option('sassc').disabled() - subproject('sassc') - sassc = find_program('sassc', required: get_option('sassc').enabled()) -endif +theme_deps = [] +# For git checkouts, but not for tarballs... +if not fs.exists('theme/Adwaita/Adwaita.css') + # ... build the theme files + sassc = find_program('sassc', required: false) + if not sassc.found() + subproject('sassc') + sassc = find_program('sassc', required: true) + endif -if sassc.found() - sassc_opts = [ '-a', '-M', '-t', 'compact' ] + if sassc.found() + sassc_opts = [ '-a', '-M', '-t', 'compact' ] - subdir('theme/Default') + subdir('theme/Default') - theme_deps = [ - default_theme_deps, - ] -else - theme_deps = [] + theme_deps += [ + default_theme_deps, + ] + endif endif gtkresources = gnome.compile_resources('gtkresources', |