1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: Christoph Hueffelmann <chr@istoph.de>
Date: Mon, 3 Nov 2025 22:23:39 +0000
Subject: src/meson.build: change include directory for parallel
installability.
Forwarded: https://github.com/tuiwidgets/tuiwidgets/issues/9
---
src/meson.build | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 98c8bb3..344fdbe 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,6 +4,7 @@ lib_name_base = 'tuiwidgets'
if qt_version == 'qt5'
lib_name_for_meson = lib_name_base
+ lib_install_path = '.'
pkg_filebase = 'TuiWidgets'
pkg_name = 'TuiWidgets'
pkg_description = 'Terminal User Interface Widget Library (Qt5 version)'
@@ -12,6 +13,7 @@ if qt_version == 'qt5'
main_ld_vscript = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), main_vscript)
elif qt_version == 'qt6'
lib_name_for_meson = lib_name_base + '-qt6'
+ lib_install_path = lib_name_for_meson
pkg_filebase = 'TuiWidgetsQt6'
pkg_name = 'TuiWidgetsQt6'
pkg_description = 'Terminal User Interface Widget Library (Qt6 version)'
@@ -229,8 +231,8 @@ tuiwidgets_lib = library(lib_name_for_meson, tuiwidgets_sources, tuiwidgets_gene
install: true
)
-install_headers(tuiwidgets_public_headers, subdir:'Tui')
-install_headers(tuiwidgets_misc_public_headers, subdir:'Tui/Misc')
+install_headers(tuiwidgets_public_headers, subdir: lib_install_path / 'Tui')
+install_headers(tuiwidgets_misc_public_headers, subdir: lib_install_path / 'Tui/Misc')
import('pkgconfig').generate(
description: pkg_description,
@@ -239,7 +241,7 @@ import('pkgconfig').generate(
url: 'https://tuiwidgets.namepad.de/',
libraries: [tuiwidgets_lib],
requires: [qt_dep],
- subdirs: ['.']
+ subdirs: [lib_install_path]
)
tuiwidgets_dep = declare_dependency(link_with: tuiwidgets_lib)
|
