meson: Add lmsensors support

v2: - Make -Dlmsensors=false work
    - Simplify auto and true cases

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/meson.build b/meson.build
index 2115871931d4d5d930e963df145d088645e72883..65c6b98609e2706733233e971f0dad7b58752dcd 100644 (file)
--- 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 fb1b63331ca5dad8a9c1101706de71a65598a47c..bcd63cc374f802bf79594f2c8dc849944df6edcd 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -157,6 +157,13 @@ option(
   choices : ['auto', 'true', 'false'],
   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',

diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index ac0231ea0e8a974ef909480ae886c88df5e8c4ee..01cb45240fc07a795c6517ae1604228cfb3f6773 100644 (file)
--- 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 01b5836be29c82d194404e3039dffdfcd232afe2..8dd2cc2e8fecc5c6d63e74cc6b54b253bdf23531 100644 (file)
--- 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 59fecfc52550cffbe1849e7c86b645e24da4464d..b62494b2966b87837a75b9e9de1fff07095341d0 100644 (file)
--- 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 0d525d8d1b3c1097c81ba5d2052ef954c79c980e..dac0bc833e5f28dd0e97be6959817919277db8a4 100644 (file)
--- 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 323b337266f168e6e7c2296435e86ed9a271b407..c23b47216eacc3cfe3b2bade28486c9d10b4700d 100644 (file)
--- 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,
   ],
 )