meson: Fix deprecated build warnings on build options

Meson now reserves the `build_` prefix for options

diff --git a/.travis.yml b/.travis.yml
index 9fbe1506fe4a875da24f3f9473f963e6269442c0..a2c1ae15fc1d032a636fbccbec79341e4454595c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -203,9 +203,9 @@ matrix:
             --buildtype=debugoptimized \
             -Db_lundef=false \
             -Dauto_features=enabled \
-            -Dbuild_programs=true \
-            -Dbuild_tests=true \
-            -Dbuild_contrib=true \
+            -Dbin_programs=true \
+            -Dbin_tests=true \
+            -Dbin_contrib=true \
             -Ddefault_library=both \
              build/meson builddir
         - pushd builddir

diff --git a/build/meson/README.md b/build/meson/README.md
index d79ed49696f7374d50b0b7ac6b0998de0bec62f1..d393a063fc0e7551afe8f9c218957953f4b9b907 100644 (file)
--- a/build/meson/README.md
+++ b/build/meson/README.md
@@ -17,7 +17,7 @@ It outputs one `libzstd`, either shared or static, depending on
 `cd` to this meson directory (`build/meson`)
 
 ```sh
-meson --buildtype=release -Dbuild_{programs,contrib}=true builddir
+meson setup -Dbin_programs=true -Dbin_contrib=true builddir
 cd builddir
 ninja             # to build
 ninja install     # to install

diff --git a/build/meson/meson.build b/build/meson/meson.build
index 7178403c2fcbd98ea0376eb1f265729ffd69a598..121811e7265816d131fdd43112d8b4a8d5c8ffa6 100644 (file)
--- a/build/meson/meson.build
+++ b/build/meson/meson.build
@@ -75,9 +75,9 @@ legacy_level = get_option('legacy_level')
 use_backtrace = get_option('backtrace')
 use_static_runtime = get_option('static_runtime')
 
-build_programs = get_option('build_programs')
-build_contrib = get_option('build_contrib')
-build_tests = get_option('build_tests')
+bin_programs = get_option('bin_programs')
+bin_contrib = get_option('bin_contrib')
+bin_tests = get_option('bin_tests')
 
 feature_multi_thread = get_option('multi_thread')
 feature_zlib = get_option('zlib')
@@ -88,7 +88,7 @@ feature_lz4 = get_option('lz4')
 # 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()
 # Arguments in dependency should be equivalent to those passed to pkg-config
@@ -133,14 +133,14 @@ 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

diff --git a/build/meson/meson_options.txt b/build/meson/meson_options.txt
index 349d915c7c495e1fa9aad27e3c0f0660b748e1f0..90a81c53918e4a361bd6e0c4c9c98601fd2ed7a9 100644 (file)
--- a/build/meson/meson_options.txt
+++ b/build/meson/meson_options.txt
@@ -19,11 +19,11 @@ option('backtrace', type: 'boolean', value: false,
 option('static_runtime', type: 'boolean', value: false,
   description: 'Link to static run-time libraries on MSVC')
 
-option('build_programs', type: 'boolean', value: true,
+option('bin_programs', type: 'boolean', value: true,
   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('multi_thread', type: 'feature', value: 'enabled',