diff --git a/.github/workflows/meson-build.yml b/.github/workflows/meson-build.yml index 13bb93acc..5c945b80e 100644 --- a/.github/workflows/meson-build.yml +++ b/.github/workflows/meson-build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v4 - uses: BSFishy/meson-build@v1.0.3 with: action: test diff --git a/src/meson.build b/src/meson.build index 1e4bbd9c4..02f0c2ca1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,14 +20,13 @@ install_headers(headers, subdir : 'modbus') lt_current = 6 lt_revision = 0 lt_age = 1 -lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision) +lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision) libmodbus = shared_library('modbus', sources, version: lt_version, - soversion: lt_current, include_directories : include_directories('..'), install : true) -incdir = include_directories('../src') +incdir = include_directories('.') libmodbus_dep = declare_dependency(link_with : libmodbus, include_directories: incdir) diff --git a/tests/meson.build b/tests/meson.build index d17d5bc0c..f78aa5920 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -2,48 +2,39 @@ configure_file(input : 'unit-test.h.in', output : 'unit-test.h', configuration : cdata) -incdir = include_directories('../src') - bandwidth_server_one = executable( 'bandwidth-server-one', 'bandwidth-server-one.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) bandwidth_server_many_up = executable( 'bandwidth-server-many-up', 'bandwidth-server-many-up.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) bandwidth_client = executable( 'bandwidth-client', 'bandwidth-client.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) random_test_server = executable( 'random-test-server', 'random-test-server.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) random_test_client = executable( 'random-test-client', 'random-test-client.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) unit_test_server = executable( 'unit-test-server', 'unit-test-server.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) unit_test_client = executable( 'unit-test-client', 'unit-test-client.c', - link_with : libmodbus, - include_directories : incdir + dependencies : libmodbus_dep ) test('unit-tests', find_program('unit-tests.sh'),