Skip to content

Commit c288d48

Browse files
authored
Merge pull request #4 from gridpoint-com/meson-support
Meson support
2 parents d2a16bc + be7174f commit c288d48

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

.github/workflows/meson-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v3
15-
- uses: actions/setup-python@v1
15+
- uses: actions/setup-python@v4
1616
- uses: BSFishy/[email protected]
1717
with:
1818
action: test

src/meson.build

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ install_headers(headers, subdir : 'modbus')
2020
lt_current = 6
2121
lt_revision = 0
2222
lt_age = 1
23-
lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision)
23+
lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision)
2424

2525
libmodbus = shared_library('modbus', sources,
2626
version: lt_version,
27-
soversion: lt_current,
2827
include_directories : include_directories('..'),
2928
install : true)
3029

31-
incdir = include_directories('../src')
30+
incdir = include_directories('.')
3231
libmodbus_dep = declare_dependency(link_with : libmodbus,
3332
include_directories: incdir)

tests/meson.build

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,39 @@ configure_file(input : 'unit-test.h.in',
22
output : 'unit-test.h',
33
configuration : cdata)
44

5-
incdir = include_directories('../src')
6-
75
bandwidth_server_one = executable(
86
'bandwidth-server-one', 'bandwidth-server-one.c',
9-
link_with : libmodbus,
10-
include_directories : incdir
7+
dependencies : libmodbus_dep
118
)
129

1310
bandwidth_server_many_up = executable(
1411
'bandwidth-server-many-up', 'bandwidth-server-many-up.c',
15-
link_with : libmodbus,
16-
include_directories : incdir
12+
dependencies : libmodbus_dep
1713
)
1814

1915
bandwidth_client = executable(
2016
'bandwidth-client', 'bandwidth-client.c',
21-
link_with : libmodbus,
22-
include_directories : incdir
17+
dependencies : libmodbus_dep
2318
)
2419

2520
random_test_server = executable(
2621
'random-test-server', 'random-test-server.c',
27-
link_with : libmodbus,
28-
include_directories : incdir
22+
dependencies : libmodbus_dep
2923
)
3024

3125
random_test_client = executable(
3226
'random-test-client', 'random-test-client.c',
33-
link_with : libmodbus,
34-
include_directories : incdir
27+
dependencies : libmodbus_dep
3528
)
3629

3730
unit_test_server = executable(
3831
'unit-test-server', 'unit-test-server.c',
39-
link_with : libmodbus,
40-
include_directories : incdir
32+
dependencies : libmodbus_dep
4133
)
4234

4335
unit_test_client = executable(
4436
'unit-test-client', 'unit-test-client.c',
45-
link_with : libmodbus,
46-
include_directories : incdir
37+
dependencies : libmodbus_dep
4738
)
4839

4940
test('unit-tests', find_program('unit-tests.sh'),

0 commit comments

Comments
 (0)