Quoting Eric Engestrom (2018-10-02 07:09:03)
> Cc: mesa-sta...@lists.freedesktop.org
> Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
> ---
> src/mesa/meson.build | 3 +--
> src/meson.build | 13 ++++++++-----
> 2 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/meson.build b/src/mesa/meson.build
> index ea884977db8052d86fcb..861b0311048eff422b9f 100644
> --- a/src/mesa/meson.build
> +++ b/src/mesa/meson.build
> @@ -705,7 +705,6 @@ files_libmesa_common += [
> ir_expression_operation_h,
> main_remap_helper_h,
> matypes_h,
> - sha1_h,
> ]
>
> if with_sse41
> @@ -726,7 +725,7 @@ libmesa_classic = static_library(
> cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
> include_directories : [inc_common, inc_libmesa_asm,
> include_directories('main')],
> link_with : [libglsl, libmesa_sse41],
> - dependencies : idep_nir_headers,
> + dependencies : [idep_nir_headers, idep_git_sha1],
> build_by_default : false,
> )
>
> diff --git a/src/meson.build b/src/meson.build
> index af881cff70bf752a6474..89ffaddf47b7286e4fe0 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -39,11 +39,14 @@ libglsl_util = static_library(
> build_by_default : false,
> )
>
> -sha1_h = custom_target(
> - 'git_sha1.h',
> - output : 'git_sha1.h',
> - command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'],
> - build_always : true, # commit sha1 can change without having touched these
> files
> +idep_git_sha1 = declare_dependency(
> + sources : custom_target(
> + 'git_sha1.h',
> + output : 'git_sha1.h',
> + command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'],
> + build_always : true, # commit sha1 can change without having touched
> these files
> + ),
> + include_directories : inc_src,What does this get us over including it in the source list, since it's a .h meson should generate the proper include paths already, right? Dylan
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
