diff options
author | Dylan Baker <[email protected]> | 2017-11-28 16:42:37 -0800 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2017-12-01 15:31:43 -0800 |
commit | 5e71efef44b992b5d70bbc1872ff230ae211141d (patch) | |
tree | 445d66212ce1bbc841391a78b1cb49d1d5c148a5 /src | |
parent | 7309207432e64678ccde2862040861146e3515d4 (diff) |
meson: Add lmsensors support
v2: - Make -Dlmsensors=false work
- Simplify auto and true cases
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/etnaviv/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/meson.build | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/meson.build | 4 | ||||
-rw-r--r-- | src/gallium/targets/dri/meson.build | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index ac0231ea0e8..01cb45240fc 100644 --- a/src/gallium/drivers/etnaviv/meson.build +++ b/src/gallium/drivers/etnaviv/meson.build @@ -97,6 +97,6 @@ etnaviv_compiler = executable( 'etnaviv_compiler_cmdline.c', include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux], link_with : [libmesa_util, libgallium, libetnaviv], - dependencies : dep_libdrm_etnaviv, + dependencies : [dep_libdrm_etnaviv, dep_lmsensors], build_by_default : false, ) diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 01b5836be29..8dd2cc2e8fe 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -218,6 +218,7 @@ ir3_compiler = executable( dep_libdrm, dep_libdrm_freedreno, dependency('threads'), + dep_lmsensors, ], link_with : [ libfreedreno, diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 59fecfc5255..b62494b2966 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -217,7 +217,7 @@ nouveau_compiler = executable( 'nouveau_compiler', 'nouveau_compiler.c', include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux], - dependencies : [dep_libdrm, dep_libdrm_nouveau], + dependencies : [dep_libdrm, dep_libdrm_nouveau, dep_lmsensors], link_with : [libnouveau, libgallium, libmesa_util], build_by_default : false, ) diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build index 0d525d8d1b3..dac0bc833e5 100644 --- a/src/gallium/drivers/r300/meson.build +++ b/src/gallium/drivers/r300/meson.build @@ -150,7 +150,9 @@ if with_tests include_directories('compiler'), ], link_with : [libr300, libgallium, libmesa_util], - dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind], + dependencies : [ + dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, dep_lmsensors, + ], ) ) endif diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 323b337266f..c23b47216ea 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -163,7 +163,7 @@ libgallium_dri = shared_library( ], dependencies : [ gallium_dri_depends, dep_selinux, dep_expat, dep_libdrm, dep_llvm, - dep_thread, + dep_thread, dep_lmsensors, ], ) |