diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-11-16 20:15:24 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2018-11-16 20:15:24 +0000 |
| commit | d6f50489d8f488e6fa84fad63f2a25973e4d3d5b (patch) | |
| tree | 6fe8476cf7b3deaeaec6696d13d9e43161a81c07 | |
| parent | 0cb3e626cc4a0897d9ff63ab9b76fa2e98430ad2 (diff) | |
| parent | 08d8063b972e5a9542b0d0e9b9f5ef587b74c73f (diff) | |
| download | atk-d6f50489d8f488e6fa84fad63f2a25973e4d3d5b.tar.gz | |
Merge branch 'fix-darwin-lib-versions' into 'master'
meson: use an autotools compatible compatibility_version/current_version on macOS. Fixes #6
Closes #6
See merge request GNOME/atk!8
| -rw-r--r-- | meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 0323896..7c66a8c 100644 --- a/meson.build +++ b/meson.build @@ -36,7 +36,9 @@ atk_conf.set_quoted('GETTEXT_PACKAGE', 'atk10') # Maintain version scheme with libtool atk_soversion = 0 -atk_libversion = '@0@.@1@.@2@'.format(atk_soversion, (atk_binary_age - atk_interface_age), atk_interface_age) +current = atk_binary_age - atk_interface_age +atk_libversion = '@0@.@1@.@2@'.format(atk_soversion, current, atk_interface_age) +darwin_versions = ['@0@'.format(current + 1), '@0@.@1@'.format(current + 1, atk_interface_age)] add_project_arguments([ '-DG_DISABLE_SINGLE_INCLUDES', '-DATK_DISABLE_SINGLE_INCLUDES' ], language: 'c') @@ -75,7 +77,7 @@ endif # Maintain compatibility with autotools on macOS if host_machine.system() == 'darwin' - common_ldflags += [ '-compatibility_version', '1', '-current_version', '1.0', ] + common_ldflags += [ '-compatibility_version', darwin_versions[0], '-current_version', darwin_versions[1]] endif # Functions |