mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 16:00:08 +01:00
meson: make dep_lua a disabler
There are cases where the freedreno `crashdec` program will not be built, but will still be used. By making dep_lua a disabler, we move closer to being able to have those tests automatically disabled when crashdec isn't built. Acked-by: Rob Clark <rob.clark@oss.qualcomm.com> Acked-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38579>
This commit is contained in:
parent
7c193ffef1
commit
1737638c98
3 changed files with 3 additions and 5 deletions
|
|
@ -1918,6 +1918,7 @@ dep_lua = dependency('lua54', 'lua5.4', 'lua-5.4',
|
||||||
'lua53', 'lua5.3', 'lua-5.3',
|
'lua53', 'lua5.3', 'lua-5.3',
|
||||||
'lua', required: false,
|
'lua', required: false,
|
||||||
allow_fallback: with_tools.contains('freedreno'),
|
allow_fallback: with_tools.contains('freedreno'),
|
||||||
|
disabler : true,
|
||||||
version: '>=5.3')
|
version: '>=5.3')
|
||||||
|
|
||||||
# Be explicit about only using this lib on Windows, to avoid picking
|
# Be explicit about only using this lib on Windows, to avoid picking
|
||||||
|
|
|
||||||
|
|
@ -162,7 +162,7 @@ else
|
||||||
warning('libarchive not found, not building replay or rddecompiler')
|
warning('libarchive not found, not building replay or rddecompiler')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if dep_lua.found() and dep_libarchive.found()
|
if dep_libarchive.found()
|
||||||
cffdump = executable(
|
cffdump = executable(
|
||||||
'cffdump',
|
'cffdump',
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
# Copyright © 2024 Intel Corporation
|
# Copyright © 2024 Intel Corporation
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
if not dep_lua.found()
|
|
||||||
subdir_done()
|
|
||||||
endif
|
|
||||||
|
|
||||||
executor_flags = [
|
executor_flags = [
|
||||||
no_override_init_args,
|
no_override_init_args,
|
||||||
sse2_args,
|
sse2_args,
|
||||||
|
|
@ -32,6 +28,7 @@ foreach v: ['90', '110', '120', '125', '200', '300']
|
||||||
idep_genxml,
|
idep_genxml,
|
||||||
idep_intel_dev,
|
idep_intel_dev,
|
||||||
],
|
],
|
||||||
|
build_by_default : false,
|
||||||
)
|
)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue