build: fix meson deprecation warning

'build_' prefix is reserved by meson, this will become an error in the
future, as indicated by a warning when configuring the build dir.

Closes #285.
parent c9f19b1f
......@@ -323,7 +323,7 @@ test-debian-asan:
- test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master
- test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git
- git clone cache/dav1d-test-data.git tests/dav1d-test-data
- meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=address -Dbuild_asm=false
- meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=address -Denable_asm=false
- ninja -C build
- cd build && time meson test -v --setup=sanitizer
dependencies: []
......@@ -345,7 +345,7 @@ test-debian-msan:
- test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master
- test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git
- git clone cache/dav1d-test-data.git tests/dav1d-test-data
- env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=memory -Db_lundef=false -Dbuild_asm=false
- env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=memory -Db_lundef=false -Denable_asm=false
- ninja -C build
- cd build && time meson test -v --setup=sanitizer
dependencies: []
......@@ -367,7 +367,7 @@ test-debian-ubsan:
- test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master
- test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git
- git clone cache/dav1d-test-data.git tests/dav1d-test-data
- env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=undefined -Db_lundef=false -Dbuild_asm=false
- env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=undefined -Db_lundef=false -Denable_asm=false
- ninja -C build
- cd build && time meson test -v --setup=sanitizer
dependencies: []
......
......@@ -78,7 +78,7 @@ The [VideoLAN Code of Conduct](https://wiki.videolan.org/CoC) applies to this pr
# Run tests
1. During initial build dir setup or `meson configure` specify `-Dbuild_tests=true`
1. During initial build dir setup or `meson configure` specify `-Denable_tests=true`
2. In the build directory run `meson test` optionally with `-v` for more verbose output, especially useful
for checkasm
......@@ -89,10 +89,10 @@ The [VideoLAN Code of Conduct](https://wiki.videolan.org/CoC) applies to this pr
```
git clone https://code.videolan.org/videolan/dav1d-test-data.git tests/dav1d-test-data
```
2. During initial build dir setup or `meson configure` specify `-Dbuild_tests=true` and `-Dtestdata_tests=true`
2. During initial build dir setup or `meson configure` specify `-Denable_tests=true` and `-Dtestdata_tests=true`
```
meson .test -Dbuild_tests=true -Dtestdata_tests=true
meson .test -Denable_tests=true -Dtestdata_tests=true
```
3. In the build directory run `meson test` optionally with `-v` for more verbose output
......
......@@ -61,7 +61,7 @@ foreach bitdepth : ['8', '16']
endforeach
# ASM option
is_asm_enabled = (get_option('build_asm') == true and
is_asm_enabled = (get_option('enable_asm') == true and
(host_machine.cpu_family().startswith('x86') or
host_machine.cpu_family() == 'aarch64' or
host_machine.cpu_family().startswith('arm') or
......@@ -69,7 +69,7 @@ is_asm_enabled = (get_option('build_asm') == true and
cdata.set10('HAVE_ASM', is_asm_enabled)
if is_asm_enabled and get_option('b_sanitize') == 'memory'
error('asm causes false positive with memory sanitizer. Use \'-Dbuild_asm=false\'.')
error('asm causes false positive with memory sanitizer. Use \'-Denable_asm=false\'.')
endif
# Logging option
......
......@@ -5,17 +5,17 @@ option('bitdepths',
choices: ['8', '16'],
description: 'Enable only specified bitdepths')
option('build_asm',
option('enable_asm',
type: 'boolean',
value: true,
description: 'Build asm files, if available')
option('build_tools',
option('enable_tools',
type: 'boolean',
value: true,
description: 'Build dav1d cli tools')
option('build_tests',
option('enable_tests',
type: 'boolean',
value: true,
description: 'Build dav1d tests')
......
......@@ -27,7 +27,7 @@
#
# Leave subdir if tests are disabled
if not get_option('build_tests')
if not get_option('enable_tests')
subdir_done()
endif
......
......@@ -27,7 +27,7 @@
#
# Leave subdir if tools are disabled
if not get_option('build_tools')
if not get_option('enable_tools')
subdir_done()
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment