From ff3d39213ecb90a8f40b3e7a7379ece9f39c1037 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 31 Mar 2019 11:04:20 -0400 Subject: [PATCH] Decided to just build everything by default and not have separate all or examples targets since we don't really have much control over what's a top-level target anyway (and ninja on its own == ninja all). Also set layout to flat by default, since it keeps everything together, which will lead to less surprising behavior on Windows and is more useful for our release packages. --- examples/meson.build | 3 --- meson.build | 2 +- test/meson.build | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 266d9e24..3b9ab82a 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -56,9 +56,6 @@ foreach name, args : libui_examples link_with: libui_libui, cpp_args: args.get('cpp_args', []), link_args: args.get('link_args', []) + libui_example_link_args, - build_by_default: false, gui_app: false, install: false) endforeach - -# MESONTODO define the top-level examples target here diff --git a/meson.build b/meson.build index 968ee514..f0af0a7c 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,6 @@ # [--layout=flat] \ (useful for distribution and Windows DLL tests) # [--b_sanitize=whatever] # It turns out that I wouldn't really need any custom options; go figure. -# MESONTODO figure out why test and examples aren't included in ninja all # TODO I'm not sure how to allow building 32-bit instead of 64-bit with meson @@ -17,6 +16,7 @@ project('libui', ['c', 'cpp'], default_options: [ 'buildtype=debug', # build debug by default 'default_library=shared', # build shared libraries by default + 'layout=flat', # keep all outputs together by default # these are forced options, but meson doesn't let me set these up separately before I call project() (TODO https://github.com/mesonbuild/meson/issues/5179) 'warning_level=3', # always max warnings diff --git a/test/meson.build b/test/meson.build index 928d814e..159ed724 100644 --- a/test/meson.build +++ b/test/meson.build @@ -44,6 +44,5 @@ endif executable('tester', libui_test_sources, dependencies: libui_binary_deps, link_with: libui_libui, - build_by_default: false, gui_app: false, install: false)