Skip to content

Commit 85ad807

Browse files
drobilladrobilla
committed
Clean up meson definitions
1 parent fc82116 commit 85ad807

File tree

6 files changed

+126
-116
lines changed

6 files changed

+126
-116
lines changed

‎icons/meson.build

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ png_icon_sizes = [
1414

1515
icons_dir = get_option('prefix') / get_option('datadir') / 'icons' / 'hicolor'
1616

17-
install_data('scalable/ingen.svg',
18-
install_dir: icons_dir / 'scalable' / 'apps')
17+
install_data('scalable/ingen.svg', install_dir: icons_dir / 'scalable' / 'apps')
1918

2019
foreach size : png_icon_sizes
21-
install_data(files(size / 'ingen.png'),
22-
install_dir: icons_dir / size / 'apps')
20+
install_data(
21+
files(size / 'ingen.png'),
22+
install_dir: icons_dir / size / 'apps',
23+
)
2324
endforeach

‎meson.build

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
# Copyright 2020-2023 David Robillard <[email protected]>
22
# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
33

4-
project('ingen', 'cpp',
5-
version: '0.5.1',
6-
license: 'GPLv3+',
7-
meson_version: '>= 0.56.0',
8-
default_options: [
9-
'b_ndebug=if-release',
10-
'buildtype=release',
11-
'cpp_std=c++17',
12-
])
4+
project(
5+
'ingen',
6+
'cpp',
7+
default_options: [
8+
'b_ndebug=if-release',
9+
'buildtype=release',
10+
'cpp_std=c++17',
11+
],
12+
license: 'GPLv3+',
13+
meson_version: '>= 0.56.0',
14+
version: '0.5.1',
15+
)
1316

1417
ingen_src_root = meson.current_source_dir()
1518
ingen_build_root = meson.current_build_dir()
@@ -32,8 +35,8 @@ add_project_arguments(cpp_suppressions, language: ['cpp'])
3235
##########################
3336

3437
lv2dir = get_option('lv2dir')
38+
prefix = get_option('prefix')
3539
if lv2dir == ''
36-
prefix = get_option('prefix')
3740
if target_machine.system() == 'darwin' and prefix == '/'
3841
lv2dir = '/Library/Audio/Plug-Ins/LV2'
3942
elif target_machine.system() == 'haiku' and prefix == '/'
@@ -50,8 +53,12 @@ endif
5053
##########################
5154

5255
# TODO: Distinguish modules from libraries and move modules to a subdirectory
53-
ingen_data_dir = get_option('prefix') / get_option('datadir') / 'ingen' # / versioned_name
54-
ingen_module_dir = get_option('prefix') / get_option('libdir') # / versioned_name
56+
ingen_data_dir = (
57+
prefix / get_option('datadir') / 'ingen' # / versioned_name
58+
)
59+
ingen_module_dir = (
60+
prefix / get_option('libdir') # / versioned_name
61+
)
5562

5663
# Use versioned name everywhere to support parallel major version installations
5764
if host_machine.system() == 'windows'
@@ -88,9 +95,7 @@ endif
8895
socket_code = '''#include <sys/socket.h>
8996
int main(void) { return socket(AF_UNIX, SOCK_STREAM, 0); }'''
9097

91-
have_socket = cpp.compiles(socket_code,
92-
args: platform_defines,
93-
name: 'socket')
98+
have_socket = cpp.compiles(socket_code, args: platform_defines, name: 'socket')
9499

95100
platform_defines += ['-DHAVE_SOCKET=@0@'.format(have_socket.to_int())]
96101

@@ -122,8 +127,8 @@ sratom_dep = dependency(
122127

123128
suil_dep = dependency(
124129
'suil-0',
125-
version: '>= 0.10.0',
126130
fallback: ['suil', 'suil_dep'],
131+
version: '>= 0.10.0',
127132
)
128133

129134
lv2_dep = dependency(
@@ -149,24 +154,31 @@ raul_dep = dependency(
149154
# Driver Dependencies #
150155
#######################
151156

152-
portaudio_dep = dependency('portaudio-2.0',
153-
version: '>= 2.0.0',
154-
include_type: 'system',
155-
required: get_option('portaudio'))
157+
portaudio_dep = dependency(
158+
'portaudio-2.0',
159+
include_type: 'system',
160+
required: get_option('portaudio'),
161+
version: '>= 2.0.0',
162+
)
156163

157-
jack_dep = dependency('jack',
158-
version: '>= 0.120.0',
159-
include_type: 'system',
160-
required: get_option('jack'))
164+
jack_dep = dependency(
165+
'jack',
166+
include_type: 'system',
167+
required: get_option('jack'),
168+
version: '>= 0.120.0',
169+
)
161170

162171
jack_port_rename_code = '''#include <jack/jack.h>
163172
int main(void) { return !!&jack_port_rename; }'''
164173

165174
platform_defines += '-DHAVE_JACK_PORT_RENAME=@0@'.format(
166-
cpp.compiles(jack_port_rename_code,
167-
args: platform_defines,
168-
dependencies: [jack_dep],
169-
name: 'jack_port_rename').to_int())
175+
cpp.compiles(
176+
jack_port_rename_code,
177+
args: platform_defines,
178+
dependencies: [jack_dep],
179+
name: 'jack_port_rename',
180+
).to_int(),
181+
)
170182

171183
#############
172184
# Libraries #

‎src/gui/meson.build

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,47 @@
77

88
gui_defines = platform_defines
99

10-
glibmm_dep = dependency('glibmm-2.4',
11-
version: '>= 2.14.0',
12-
include_type: 'system',
13-
required: get_option('gui'))
14-
15-
gthread_dep = dependency('gthread-2.0',
16-
version: '>= 2.14.0',
17-
include_type: 'system',
18-
required: get_option('gui'))
19-
20-
gtkmm_dep = dependency('gtkmm-2.4',
21-
version: '>= 2.14.0',
22-
include_type: 'system',
23-
required: get_option('gui'))
24-
25-
ganv_dep = dependency('ganv-1',
26-
version: '>= 1.5.2',
27-
fallback: ['ganv', 'ganv_dep'],
28-
required: get_option('gui'))
29-
30-
webkit_dep = dependency('webkit-1.0',
31-
version: '>= 1.4.0',
32-
include_type: 'system',
33-
required: false)
34-
35-
build_gui = (glibmm_dep.found() and
36-
gthread_dep.found() and
37-
gtkmm_dep.found() and
38-
ganv_dep.found())
10+
glibmm_dep = dependency(
11+
'glibmm-2.4',
12+
include_type: 'system',
13+
required: get_option('gui'),
14+
version: '>= 2.14.0',
15+
)
16+
17+
gthread_dep = dependency(
18+
'gthread-2.0',
19+
include_type: 'system',
20+
required: get_option('gui'),
21+
version: '>= 2.14.0',
22+
)
23+
24+
gtkmm_dep = dependency(
25+
'gtkmm-2.4',
26+
include_type: 'system',
27+
required: get_option('gui'),
28+
version: '>= 2.14.0',
29+
)
30+
31+
ganv_dep = dependency(
32+
'ganv-1',
33+
fallback: ['ganv', 'ganv_dep'],
34+
required: get_option('gui'),
35+
version: '>= 1.5.2',
36+
)
37+
38+
webkit_dep = dependency(
39+
'webkit-1.0',
40+
include_type: 'system',
41+
required: false,
42+
version: '>= 1.4.0',
43+
)
44+
45+
build_gui = (
46+
glibmm_dep.found()
47+
and gthread_dep.found()
48+
and gtkmm_dep.found()
49+
and ganv_dep.found()
50+
)
3951

4052
if webkit_dep.found()
4153
gui_defines += ['-DHAVE_WEBKIT=1']
@@ -149,15 +161,19 @@ if build_gui
149161
config = configuration_data()
150162
config.set('INGEN_VERSION', meson.project_version())
151163

152-
configure_file(configuration: config,
153-
input: files('ingen_gui.ui.in'),
154-
output: 'ingen_gui.ui',
155-
install: true,
156-
install_dir: ingen_data_dir)
157-
158-
configure_file(copy: true,
159-
input: files('ingen_style.rc'),
160-
output: '@PLAINNAME@',
161-
install: true,
162-
install_dir: ingen_data_dir)
164+
configure_file(
165+
configuration: config,
166+
input: files('ingen_gui.ui.in'),
167+
install: true,
168+
install_dir: ingen_data_dir,
169+
output: 'ingen_gui.ui',
170+
)
171+
172+
configure_file(
173+
copy: true,
174+
input: files('ingen_style.rc'),
175+
install: true,
176+
install_dir: ingen_data_dir,
177+
output: '@PLAINNAME@',
178+
)
163179
endif

‎src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ sources = files(
2121
'URIMap.cpp',
2222
'URIs.cpp',
2323
'World.cpp',
24-
'runtime_paths.cpp'
24+
'runtime_paths.cpp',
2525
)
2626

2727
if have_socket

‎src/server/meson.build

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@
66
##########
77

88
server_sources = files(
9+
'events/Connect.cpp',
10+
'events/Copy.cpp',
11+
'events/CreateBlock.cpp',
12+
'events/CreateGraph.cpp',
13+
'events/CreatePort.cpp',
14+
'events/Delete.cpp',
15+
'events/Delta.cpp',
16+
'events/Disconnect.cpp',
17+
'events/DisconnectAll.cpp',
18+
'events/Get.cpp',
19+
'events/Mark.cpp',
20+
'events/Move.cpp',
21+
'events/SetPortValue.cpp',
22+
'events/Undo.cpp',
23+
'internals/BlockDelay.cpp',
24+
'internals/Controller.cpp',
25+
'internals/Note.cpp',
26+
'internals/Time.cpp',
27+
'internals/Trigger.cpp',
928
'ArcImpl.cpp',
1029
'BlockFactory.cpp',
1130
'BlockImpl.cpp',
@@ -33,26 +52,7 @@ server_sources = files(
3352
'Task.cpp',
3453
'UndoStack.cpp',
3554
'Worker.cpp',
36-
'events/Connect.cpp',
37-
'events/Copy.cpp',
38-
'events/CreateBlock.cpp',
39-
'events/CreateGraph.cpp',
40-
'events/CreatePort.cpp',
41-
'events/Delete.cpp',
42-
'events/Delta.cpp',
43-
'events/Disconnect.cpp',
44-
'events/DisconnectAll.cpp',
45-
'events/Get.cpp',
46-
'events/Mark.cpp',
47-
'events/Move.cpp',
48-
'events/SetPortValue.cpp',
49-
'events/Undo.cpp',
5055
'ingen_engine.cpp',
51-
'internals/BlockDelay.cpp',
52-
'internals/Controller.cpp',
53-
'internals/Note.cpp',
54-
'internals/Time.cpp',
55-
'internals/Trigger.cpp',
5656
'mix.cpp',
5757
)
5858

‎tests/meson.build

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
11
# Copyright 2019-2022 David Robillard <[email protected]>
22
# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
33

4-
##############
5-
# Unit Tests #
6-
##############
7-
8-
unit_tests = [
9-
]
10-
11-
foreach test : unit_tests
12-
test(
13-
test,
14-
executable(
15-
test,
16-
files('tst_@[email protected]'.format(test)),
17-
cpp_args: cpp_suppressions + platform_defines,
18-
dependencies: [ingen_dep],
19-
),
20-
suite: 'unit',
21-
)
22-
endforeach
23-
244
#####################
255
# Integration Tests #
266
#####################
@@ -93,19 +73,20 @@ test_env = environment(
9373
default_value: lv2dir,
9474
internal: 'plugindir',
9575
pkgconfig: 'plugindir',
96-
)
76+
),
9777
],
9878
),
99-
})
79+
},
80+
)
10081

10182
foreach test : integration_tests
10283
test(
10384
test,
10485
ingen_test,
10586
env: test_env,
10687
args: [
107-
'--load', empty_manifest,
108-
'--execute', files(test + '.ttl'),
88+
['--load', empty_manifest],
89+
['--execute', files(test + '.ttl')],
10990
],
11091
)
11192
endforeach

0 commit comments

Comments
 (0)