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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
wf-touch and wf-utils are untagged and have no other consumers. Keep
it private to wayfire package for now.
--- meson.build.orig 2023-10-07 08:36:28 UTC
+++ meson.build
@@ -69,8 +69,8 @@ endif
endif
endif
-wfutils = subproject('wf-utils').get_variable('wfutils')
-wftouch = subproject('wf-touch').get_variable('wftouch')
+wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils')
+wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch')
needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
libinotify = dependency('libinotify', required: needs_libinotify)
--- subprojects/wf-utils/meson.build.orig 2020-05-11 09:28:45 UTC
+++ subprojects/wf-utils/meson.build
@@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils',
sources,
dependencies: [],
include_directories: wfutils_inc,
- install: true,
+ install: not meson.is_subproject(),
version: meson.project_version())
+if not meson.is_subproject()
pkgconfig = import('pkgconfig')
pkgconfig.generate(
libraries: lib_wfutils,
@@ -44,6 +45,7 @@ pkgconfig.generate(
filebase: meson.project_name(),
name: meson.project_name(),
description: 'Utilities library for Wayfire')
+endif
install_headers([], subdir: 'wayfire/utils')
@@ -85,12 +87,14 @@ headers_root = [
'wayfire/variant.hpp',
]
+if not meson.is_subproject()
install_headers(headers_action, subdir: 'wayfire/action')
install_headers(headers_condition, subdir: 'wayfire/condition')
install_headers(headers_lexer, subdir: 'wayfire/lexer')
install_headers(headers_parser, subdir: 'wayfire/parser')
install_headers(headers_rule, subdir: 'wayfire/rule')
install_headers(headers_root, subdir: 'wayfire')
+endif
# -------------------------------------------------------------------------------------------------
# Unit tests
--- subprojects/wf-touch/meson.build.orig 2021-03-19 14:56:39 UTC
+++ subprojects/wf-touch/meson.build
@@ -6,18 +6,22 @@ project('wf-touch', ['cpp'],
glm = dependency('glm')
wf_touch_inc_dirs = include_directories('.')
+if not meson.is_subproject()
install_headers([
'wayfire/touch/touch.hpp'],
subdir: 'wayfire/touch')
+endif
wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'],
- dependencies: glm, install: true)
+ dependencies: glm, install: not meson.is_subproject())
wftouch = declare_dependency(link_with: wftouch_lib,
include_directories: wf_touch_inc_dirs, dependencies: glm)
+if not meson.is_subproject()
doctest = dependency('doctest', required: get_option('tests'))
if doctest.found()
subdir('test')
+endif
endif
|
