Move peci dependency into subdir
intel-cpu is the only function that uses peci, and given peci is an
intel-specific hardware interface, likely always will be.
Move the peci dependency to be resolved within cpu sensor. This allows
deduplication of one header check, and makes intel-cpu more
self-contained (cleaning up src/meson.build)
Change-Id: I02926d2663f2114be1eaae95c63ae4051a4d6cbf
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/src/intel-cpu/meson.build b/src/intel-cpu/meson.build
index 62e6125..ed79bd7 100644
--- a/src/intel-cpu/meson.build
+++ b/src/intel-cpu/meson.build
@@ -2,12 +2,14 @@
subdir_done()
endif
-intel_cpu_inc = src_inc
-
-if not meson.get_compiler('cpp').has_header('linux/peci-ioctl.h')
- intel_cpu_inc = [src_inc, '../../include']
+intel_cpu_inc = [src_inc]
+cxx = meson.get_compiler('cpp')
+if not cxx.has_header('linux/peci-ioctl.h')
+ intel_cpu_inc += include_directories('../../include')
endif
+peci_dep = dependency('libpeci', required: true)
+
executable(
'intelcpusensor',
'IntelCPUSensorMain.cpp',
@@ -17,4 +19,3 @@
install: true,
install_dir: '/usr/libexec/dbus-sensors',
)
-
diff --git a/src/meson.build b/src/meson.build
index 53331a5..a5b59b7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -101,15 +101,6 @@
src_inc = include_directories('.')
-peci_incdirs = []
-if not meson.get_compiler('cpp').has_header('linux/peci-ioctl.h')
- peci_incdirs = ['../include']
-endif
-
-if get_option('intel-cpu').allowed()
- peci_dep = dependency('libpeci', required: true)
-endif
-
subdir('adc')
subdir('cable-monitor')
subdir('exit-air')
