commit 6b234c155431d4a1f721e347deeee0743ec7acb5
author Eddie James <eajames@linux.ibm.com> Wed Oct 20 16:35:47 2021 -0500
committer Edward A. James <eajames@us.ibm.com> Thu Oct 21 13:38:15 2021 +0000
tree 1bf5efed96c3bbf0fde14a65fd52addba2def0ef
parent 3f710bd85332f5b3f8fc4ad7955b6985015b15ca

Change yamldir to refer to a directory

To maintain the behavior of the autotools build, the "yamldir"
configuration option should refer to the directory in which to find
the occ_sensor.yaml file. Drop the -f argument to the sensor
generation python script and change the default yamldir argument.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Change-Id: I7a93a0c403c4ce473ea2d7350f3ee441bc55c4be

meson.build

diff --git a/meson.build b/meson.build
index daf1c15..68f2c21 100644
--- a/meson.build
+++ b/meson.build
@@ -168,7 +168,7 @@
 
     yamldir = get_option('yamldir')
     if yamldir == ''
-        yamldir = meson.project_source_root() / 'example/occ_sensor.yaml'
+        yamldir = meson.project_source_root() / 'example'
     endif
 
     # Generate occ-sensor.hpp.
@@ -177,8 +177,7 @@
         command : [
             python_prog,
             meson.project_source_root() + '/sensor_gen.py',
-            '-f', meson.project_source_root() / yamldir,
-            '-i', meson.current_build_dir(),
+            '-i', yamldir,
         ],
         output : 'occ-sensor.hpp')
     sources += [occ_sensor_hpp]