diff options
| author | Lzu Tao <taolzu@gmail.com> | 2019-06-29 03:10:05 (GMT) |
|---|---|---|
| committer | Lzu Tao <taolzu@gmail.com> | 2019-06-29 03:10:05 (GMT) |
| commit | 4c60f25c6510f81a6bc2921a3fb7a77dc71f5d8a (patch) | |
| tree | d42324f19720ac83ef42615715983380a92f7f34 /contrib | |
| parent | 8b97fcda6061a88646cfd5eeb0a8797f2d3b6845 (diff) | |
| download | lz4-4c60f25c6510f81a6bc2921a3fb7a77dc71f5d8a.zip lz4-4c60f25c6510f81a6bc2921a3fb7a77dc71f5d8a.tar.gz lz4-4c60f25c6510f81a6bc2921a3fb7a77dc71f5d8a.tar.bz2 | |
meson: Fix deprecated warnings on build options
Meson now reserves `build_` prefix options.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/meson/README.md | 2 | ||||
| -rw-r--r-- | contrib/meson/meson.build | 18 | ||||
| -rw-r--r-- | contrib/meson/meson_options.txt | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/contrib/meson/README.md b/contrib/meson/README.md index fa18493..a44850a 100644 --- a/contrib/meson/README.md +++ b/contrib/meson/README.md @@ -13,7 +13,7 @@ This Meson build system is provided with no guarantee. `cd` to this meson directory (`contrib/meson`) ```sh -meson setup --buildtype=release -Ddefault_library=shared -Dbuild_programs=true builddir +meson setup --buildtype=release -Ddefault_library=shared -Dbin_programs=true builddir cd builddir ninja # to build ninja install # to install diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index c28d90a..65a4c26 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -69,17 +69,17 @@ use_debug = get_option('debug') debug_level = get_option('debug_level') use_backtrace = get_option('backtrace') -build_programs = get_option('build_programs') -build_contrib = get_option('build_contrib') -build_tests = get_option('build_tests') -build_examples = get_option('build_examples') +bin_programs = get_option('bin_programs') +bin_contrib = get_option('bin_contrib') +bin_tests = get_option('bin_tests') +bin_examples = get_option('bin_examples') #feature_multi_thread = get_option('multi_thread') # ============================================================================= # Dependencies # ============================================================================= -#libm_dep = cc.find_library('m', required: build_tests) +#libm_dep = cc.find_library('m', required: bin_tests) #thread_dep = dependency('threads', required: feature_multi_thread) #use_multi_thread = thread_dep.found() @@ -108,18 +108,18 @@ endif subdir('lib') -if build_programs +if bin_programs subdir('programs') endif -if build_tests +if bin_tests subdir('tests') endif -if build_contrib +if bin_contrib subdir('contrib') endif -if build_examples +if bin_examples subdir('examples') endif diff --git a/contrib/meson/meson_options.txt b/contrib/meson/meson_options.txt index f6a4ae7..a409c2d 100644 --- a/contrib/meson/meson_options.txt +++ b/contrib/meson/meson_options.txt @@ -14,11 +14,11 @@ option('debug_level', type: 'integer', min: 0, max: 7, value: 1, option('backtrace', type: 'boolean', value: false, description: 'Display a stack backtrace when execution generates a runtime exception') -option('build_programs', type: 'boolean', value: false, +option('bin_programs', type: 'boolean', value: false, description: 'Enable programs build') -option('build_tests', type: 'boolean', value: false, +option('bin_tests', type: 'boolean', value: false, description: 'Enable tests build') -option('build_contrib', type: 'boolean', value: false, +option('bin_contrib', type: 'boolean', value: false, description: 'Enable contrib build') -option('build_examples', type: 'boolean', value: false, +option('bin_examples', type: 'boolean', value: false, description: 'Enable examples build') |