diff --git a/.pick_status.json b/.pick_status.json index e2d014a8df8..131324b0577 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1304,7 +1304,7 @@ "description": "glcpp/meson: fix libglcpp generated header dependency", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 1ec26cb1a7b..818759695a4 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -28,10 +28,16 @@ glcpp_lex = custom_target( command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'], ) +glcpp_header_gen_deps = declare_dependency( + sources : [ + glcpp_parse[1], + ], +) + libglcpp = static_library( 'glcpp', [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, glcpp_header_gen_deps], include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [no_override_init_args, c_msvc_compat_args], cpp_args : [cpp_msvc_compat_args],