ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some meson build options to match autoconf convention

Browse Source
This commit is contained in:
Lzu Tao
2018-12-01 23:18:59 +07:00
parent 9ac9cbc9de
commit 918e0d5c36
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -76,7 +76,7 @@ script:
&& pip3.5 install --user meson ninja; && pip3.5 install --user meson ninja;
mkdir build/meson/build; mkdir build/meson/build;
pushd "$_"; pushd "$_";
meson --buildtype=debug -Dbuild_contrib=true -Dbuild_tests=true .. meson --buildtype=debug -D with-contrib=true -D with-tests=true -D with-contrib=true ..
&& ninja && ninja
&& DESTDIR=./staging ninja install && DESTDIR=./staging ninja install
&& tree ./staging; && tree ./staging;
build/meson/lib/meson.build
+6 -6
View File
@@ -53,14 +53,14 @@ libzstd_sources = [join_paths(library_common_dir, 'entropy_common.c'),
join_paths(library_deprecated_dir, 'zbuff_compress.c'), join_paths(library_deprecated_dir, 'zbuff_compress.c'),
join_paths(library_deprecated_dir, 'zbuff_decompress.c')] join_paths(library_deprecated_dir, 'zbuff_decompress.c')]
if legacy_support == '0' if with_legacy_support == '0'
legacy_support = 'false' with_legacy_support = 'false'
endif endif
if legacy_support != 'false' if with_legacy_support != 'false'
if legacy_support == 'true' if with_legacy_support == 'true'
legacy_support = '5' with_legacy_support = '5'
endif endif
legacy_int = legacy_support.to_int() legacy_int = with_legacy_support.to_int()
if legacy_int < 0 or legacy_int >= 8 if legacy_int < 0 or legacy_int >= 8
legacy_int = 0 legacy_int = 0
endif endif
build/meson/meson.build
+12 -11
View File
@@ -42,15 +42,16 @@ contrib_meson_dir = join_paths(zstd_source_dir, 'contrib', 'meson')
# ============================================================================= # =============================================================================
# Project options # Project options
# ============================================================================= # =============================================================================
enable_debug = get_option('debug') enable_debug = get_option('debug')
legacy_support = get_option('legacy_support') with_legacy_support = get_option('with-legacy-support')
enable_programs = get_option('build_programs') with_programs = get_option('with-programs')
enable_tests = get_option('build_tests') with_tests = get_option('with-tests')
enable_contrib = get_option('build_contrib') with_contrib = get_option('with-contrib')
enable_multithread = get_option('multithread_support') enable_multithread = get_option('enable-multithread')
enable_zlib = get_option('zlib_support') enable_zlib = get_option('enable-zlib')
enable_lzma = get_option('lzma_support') enable_lzma = get_option('enable-lzma')
enable_lz4 = get_option('lz4_support') enable_lz4 = get_option('enable-lz4')
# ============================================================================= # =============================================================================
# Helper scripts for Meson # Helper scripts for Meson
@@ -104,14 +105,14 @@ endif
subdir('lib') subdir('lib')
if enable_programs if with_programs
subdir('programs') subdir('programs')
endif endif
if enable_tests if with_tests
subdir('tests') subdir('tests')
endif endif
if enable_contrib if with_contrib
subdir('contrib') subdir('contrib')
endif endif
build/meson/meson_options.txt
+9 -9
View File
@@ -8,21 +8,21 @@
# in the COPYING file in the root directory of this source tree). # in the COPYING file in the root directory of this source tree).
# ############################################################################# # #############################################################################
option('multithread_support', type: 'boolean', value: true, option('enable-multithread', type: 'boolean', value: true,
description: 'Enable multi-threading when pthread is detected') description: 'Enable multi-threading when pthread is detected')
option('legacy_support', type: 'string', value: '5', option('with-legacy-support', type: 'string', value: '5',
description: 'Support any legacy format: true or false, or 7 to 1 for v0.7+ to v0.1+') description: 'Support any legacy format: true or false, or 7 to 1 for v0.7+ to v0.1+')
option('build_programs', type: 'boolean', value: true, option('with-programs', type: 'boolean', value: true,
description: 'Enable programs build') description: 'Enable programs build')
option('build_contrib', type: 'boolean', value: false, option('with-contrib', type: 'boolean', value: false,
description: 'Enable contrib build') description: 'Enable contrib build')
option('build_tests', type: 'boolean', value: false, option('with-tests', type: 'boolean', value: false,
description: 'Enable tests build') description: 'Enable tests build')
option('use_static_runtime', type: 'boolean', value: false, option('enable-static-runtime', type: 'boolean', value: false,
description: 'Link to static run-time libraries on MSVC') description: 'Link to static run-time libraries on MSVC')
option('zlib_support', type: 'boolean', value: false, option('enable-zlib', type: 'boolean', value: false,
description: 'Enable zlib support') description: 'Enable zlib support')
option('lzma_support', type: 'boolean', value: false, option('enable-lzma', type: 'boolean', value: false,
description: 'Enable lzma support') description: 'Enable lzma support')
option('lz4_support', type: 'boolean', value: false, option('enable-lz4', type: 'boolean', value: false,
description: 'Enable lz4 support') description: 'Enable lz4 support')