Merge pull request #968 from shawnl/dev

meson: get soversion right
This commit is contained in:
Yann Collet 2017-12-30 16:16:37 +01:00 committed by GitHub
commit b6887b6d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions

View File

@ -39,9 +39,19 @@ libzstd_srcs = [
libzstd_includes = [include_directories(common_dir, dictbuilder_dir, compress_dir, lib_dir)] libzstd_includes = [include_directories(common_dir, dictbuilder_dir, compress_dir, lib_dir)]
legacy = get_option('legacy_support') legacy = get_option('legacy_support')
if legacy == '0'
legacy = 'false'
endif
if legacy != 'false' if legacy != 'false'
if legacy == 'true'
legacy = '1'
endif
#See ZSTD_LEGACY_SUPPORT of programs/README.md
message('Enabling legacy support back to version 0.' + legacy) message('Enabling legacy support back to version 0.' + legacy)
legacy_int = legacy.to_int() legacy_int = legacy.to_int()
if legacy_int > 7
legacy_int = 7
endif
libzstd_cflags = ['-DZSTD_LEGACY_SUPPORT=' + legacy] libzstd_cflags = ['-DZSTD_LEGACY_SUPPORT=' + legacy]
legacy_dir = join_paths(lib_dir, 'legacy') legacy_dir = join_paths(lib_dir, 'legacy')
@ -84,7 +94,9 @@ libzstd = library('zstd',
include_directories: libzstd_includes, include_directories: libzstd_includes,
c_args: libzstd_cflags, c_args: libzstd_cflags,
dependencies: libzstd_deps, dependencies: libzstd_deps,
install: true) install: true,
soversion: '1',
)
programs_dir = join_paths('..', '..', 'programs') programs_dir = join_paths('..', '..', 'programs')

View File

@ -1,2 +1,3 @@
option('multithread', type: 'boolean', value: false) option('multithread', type: 'boolean', value: false)
option('legacy_support', type: 'string', value: '4') option('legacy_support', type: 'string', value: '4',
description: 'True or false, or 7 to 1 for v0.7+ to v0.1+.')