ncurses-meson-dep

Meson ncurses detection 100% real no fake
git clone git://git.sgregoratto.me/ncurses-meson-dep
Log | Files | Refs | README

commit 5bf28a9a7887377daea455645a0a53ce378f0f45
parent db29a10cdfce4bfd0d38a947b47de6e563acd238
Author: Stephen Gregoratto <dev@sgregoratto.me>
Date:   Fri,  4 Sep 2020 15:18:13 +1000

Comment out 2nd dependency check, fix indent

Diffstat:
Mncurses/meson.build | 35++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/ncurses/meson.build b/ncurses/meson.build @@ -1,8 +1,8 @@ # Ultimate ncurses detection 100% real no fake nc_libs = [ - 'ncursesw', - 'ncurses', - 'curses' + 'ncursesw', + 'ncurses', + 'curses' ] nc_headers = [ 'ncursesw/ncurses.h', @@ -42,26 +42,27 @@ foreach l : nc_libs endif endforeach foreach p : nc_progs - curses = dependency(p, method: 'config', required: false) - if curses.found() - subdir_done() - endif - name = p + '-config' + # Method is whitelisted for specific libraries, darn. + #curses = dependency(p, method: 'config', required: false) + #if curses.found() + # subdir_done() + #endif + name = p + '-config' prog = find_program(name, - / 'bin' / name, - / 'usr' / 'bin' / name, - / 'usr' / 'local' / 'bin' / name, - required: false - ) + / 'bin' / name, + / 'usr' / 'bin' / name, + / 'usr' / 'local' / 'bin' / name, + required: false + ) if not prog.found() continue endif - libs = run_command(prog, '--libs-only-l').stdout().strip() - cflags = run_command(prog, '--cflags').stdout().strip() + libs = run_command(prog, '--libs-only-l').stdout().strip() + cflags = run_command(prog, '--cflags').stdout().strip() version = run_command(prog, '--version').stdout().strip() - cflags = ' '.join([cflags, wide_incantations]) - curses = declare_dependency( + cflags = ' '.join([cflags, wide_incantations]) + curses = declare_dependency( compile_args: cflags, link_args: libs, version: version,