[libcamera-devel,v3,01/14] libcamera: Use 'files()' function to specify gen-header.sh

Message ID 20190630233817.10130-2-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • libcamera Controls
Related show

Commit Message

Laurent Pinchart June 30, 2019, 11:38 p.m. UTC
From: Kieran Bingham <kieran.bingham@ideasonboard.com>

The files() function generates a variable with the location of the
referenced files.

This is shorter than joining the current_source_dir() of which use is
somewhat frowned upon.

Fixes: 90de3690c456 ("libcamera: Auto-generate libcamera.h")
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 1b86fdc7fca4..15484724df01 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -14,7 +14,7 @@  libcamera_api = files([
     'timer.h',
 ])
 
-gen_header = join_paths(meson.current_source_dir(), 'gen-header.sh')
+gen_header = files('gen-header.sh')
 
 libcamera_h = custom_target('gen-header',
                             input : 'meson.build',