[libcamera-devel,1/3] meson: Process utils first

Message ID 20200909130559.1122914-2-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • Unify utils locations
Related show

Commit Message

Kieran Bingham Sept. 9, 2020, 1:05 p.m. UTC
The utils directory can contain helpers and support tools which are used
throughout other components of the build.

Ensure that the utils subdir is parsed first allowing helpers to be
defined there.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart Sept. 10, 2020, 4:36 a.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Wed, Sep 09, 2020 at 02:05:57PM +0100, Kieran Bingham wrote:
> The utils directory can contain helpers and support tools which are used
> throughout other components of the build.
> 
> Ensure that the utils subdir is parsed first allowing helpers to be
> defined there.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 1ea35e92ed67..510a6d3b44e6 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -100,9 +100,11 @@ add_project_link_arguments(cpp_arguments, language : 'cpp')
>  
>  libcamera_includes = include_directories('include')
>  
> +# Utilities are parsed first to provide support for other components.
> +subdir('utils')
> +
>  subdir('include')
>  subdir('src')
> -subdir('utils')
>  
>  # The documentation and test components are optional and can be disabled
>  # through configuration values. They are enabled by default.

Patch

diff --git a/meson.build b/meson.build
index 1ea35e92ed67..510a6d3b44e6 100644
--- a/meson.build
+++ b/meson.build
@@ -100,9 +100,11 @@  add_project_link_arguments(cpp_arguments, language : 'cpp')
 
 libcamera_includes = include_directories('include')
 
+# Utilities are parsed first to provide support for other components.
+subdir('utils')
+
 subdir('include')
 subdir('src')
-subdir('utils')
 
 # The documentation and test components are optional and can be disabled
 # through configuration values. They are enabled by default.