meson: use a feature option for microsoft-clc
It's less code and makes the configuration easier to fine tune.
Fixes: ff05da7f8d
("microsoft: Add CLC frontend and kernel/compute support to DXIL converter")
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7699>
This commit is contained in:
parent
7ca4a478ad
commit
a5227465c1
31
meson.build
31
meson.build
|
@ -299,25 +299,18 @@ if with_aco_tests and not with_amd_vk
|
||||||
error('ACO tests require Radv')
|
error('ACO tests require Radv')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
_microsoft_clc = get_option('microsoft-clc')
|
dep_clang = dependency(
|
||||||
if _microsoft_clc == 'auto'
|
'clang',
|
||||||
with_microsoft_clc = false
|
method : 'cmake',
|
||||||
else
|
static : true,
|
||||||
with_microsoft_clc = _microsoft_clc == 'true'
|
modules : [
|
||||||
endif
|
'clangBasic', 'clangCodeGen', 'clangDriver', 'clangFrontend', 'clangFrontendTool',
|
||||||
|
'clangHandleCXX', 'clangHandleLLVM',
|
||||||
if with_microsoft_clc
|
],
|
||||||
with_clc = true
|
required : get_option('microsoft-clc'),
|
||||||
dep_clang = dependency(
|
)
|
||||||
'clang',
|
with_microsoft_clc = dep_clang.found()
|
||||||
method: 'cmake',
|
with_clc = dep_clang.found()
|
||||||
static: true,
|
|
||||||
modules: [
|
|
||||||
'clangBasic', 'clangCodeGen', 'clangDriver', 'clangFrontend', 'clangFrontendTool',
|
|
||||||
'clangHandleCXX', 'clangHandleLLVM',
|
|
||||||
],
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if host_machine.system() == 'darwin'
|
if host_machine.system() == 'darwin'
|
||||||
with_dri_platform = 'apple'
|
with_dri_platform = 'apple'
|
||||||
|
|
|
@ -268,9 +268,8 @@ option(
|
||||||
)
|
)
|
||||||
option(
|
option(
|
||||||
'microsoft-clc',
|
'microsoft-clc',
|
||||||
type : 'combo',
|
type : 'feature',
|
||||||
value : 'auto',
|
value : 'auto',
|
||||||
choices : ['auto', 'true', 'false'],
|
|
||||||
description : 'Build support for the Microsoft CLC to DXIL compiler'
|
description : 'Build support for the Microsoft CLC to DXIL compiler'
|
||||||
)
|
)
|
||||||
option(
|
option(
|
||||||
|
|
Loading…
Reference in New Issue