Module: Mesa Branch: master Commit: 5e71efef44b992b5d70bbc1872ff230ae211141d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e71efef44b992b5d70bbc1872ff230ae211141d
Author: Dylan Baker <[email protected]> Date: Tue Nov 28 16:42:37 2017 -0800 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]> --- meson.build | 11 +++++++++++ meson_options.txt | 7 +++++++ src/gallium/drivers/etnaviv/meson.build | 2 +- src/gallium/drivers/freedreno/meson.build | 1 + src/gallium/drivers/nouveau/meson.build | 2 +- src/gallium/drivers/r300/meson.build | 4 +++- src/gallium/targets/dri/meson.build | 2 +- 7 files changed, 25 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2115871931..65c6b98609 100644 --- a/meson.build +++ b/meson.build @@ -926,6 +926,17 @@ if get_option('gallium-extra-hud') pre_args += '-DHAVE_GALLIUM_EXTRA_HUD=1' endif +_sensors = get_option('lmsensors') +if _sensors != 'false' + dep_lmsensors = cc.find_library('libsensors', required : _sensors == 'true') + if dep_lmsensors.found() + pre_args += '-DHAVE_LIBSENSORS=1' + endif +else + dep_lmsensors = [] +endif + + # TODO: nine # TODO: clover diff --git a/meson_options.txt b/meson_options.txt index fb1b63331c..bcd63cc374 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -158,6 +158,13 @@ option( description : 'Use libunwind for stack-traces' ) option( + 'lmsensors', + type : 'combo', + value : 'auto', + choices : ['auto', 'true', 'false'], + description : 'Enable HUD lmsensors support.' +) +option( 'build-tests', type : 'boolean', value : false, diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index ac0231ea0e..01cb45240f 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 01b5836be2..8dd2cc2e8f 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 59fecfc525..b62494b296 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 0d525d8d1b..dac0bc833e 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 323b337266..c23b47216e 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, ], ) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
