[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] meson: fix detection of curses with pkgconfig
From: |
Paolo Bonzini |
Subject: |
[PATCH 4/7] meson: fix detection of curses with pkgconfig |
Date: |
Wed, 16 Dec 2020 16:02:04 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 39fc9b7143..ab622ae8bd 100644
--- a/meson.build
+++ b/meson.build
@@ -500,16 +500,16 @@ if have_system and not get_option('curses').disabled()
endif
endforeach
msg = get_option('curses').enabled() ? 'curses library not found' : ''
+ curses_compile_args = ['-DNCURSES_WIDECHAR']
if curses.found()
- if cc.links(curses_test, dependencies: [curses])
- curses = declare_dependency(compile_args: '-DNCURSES_WIDECHAR',
dependencies: [curses])
+ if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
+ curses = declare_dependency(compile_args: curses_compile_args,
dependencies: [curses])
else
msg = 'curses package not usable'
curses = not_found
endif
endif
if not curses.found()
- curses_compile_args = ['-DNCURSES_WIDECHAR']
has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
if targetos != 'windows' and not has_curses_h
message('Trying with /usr/include/ncursesw')
--
2.29.2
- [PATCH 0/7] First round of meson bugfixes and cleanups for 6.0, Paolo Bonzini, 2020/12/16
- [PATCH 1/7] Makefile: add dummy target for build.ninja dependencies, Paolo Bonzini, 2020/12/16
- [PATCH 4/7] meson: fix detection of curses with pkgconfig,
Paolo Bonzini <=
- [PATCH 5/7] meson: use pkg-config method for libudev, Paolo Bonzini, 2020/12/16
- [PATCH 3/7] meson: switch minimum meson version to 0.56.0, Paolo Bonzini, 2020/12/16
- [PATCH 6/7] meson: use dependency to gate block modules, Paolo Bonzini, 2020/12/16
- [PATCH 2/7] meson: update submodule to 0.56.0, Paolo Bonzini, 2020/12/16
- [PATCH 7/7] meson: cleanup Kconfig.host handling, Paolo Bonzini, 2020/12/16