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>
This commit is contained in:
Dylan Baker
2017-11-28 16:42:37 -08:00
parent 7309207432
commit 5e71efef44
7 changed files with 25 additions and 4 deletions
+1 -1
View File
@@ -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,
)
@@ -218,6 +218,7 @@ ir3_compiler = executable(
dep_libdrm,
dep_libdrm_freedreno,
dependency('threads'),
dep_lmsensors,
],
link_with : [
libfreedreno,
+1 -1
View File
@@ -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,
)
+3 -1
View File
@@ -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
+1 -1
View File
@@ -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,
],
)