From 968302293070e39e726cdd210907b151821072a7 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 14 Jul 2020 13:39:12 +0100 Subject: [PATCH] metrics: fix header installation with meson If Jansson was found, the headers list is overwritten when including rte_metrics_telemetry.h, which prevents rte_metrics.h from being installed. This is now fixed to add to headers, rather than overwrite, to allow both headers be installed when Jansson is present. Fixes: c5b7197f662e ("telemetry: move some functions to metrics library") Cc: stable@dpdk.org Signed-off-by: Ciara Power Acked-by: David Marchand --- lib/librte_metrics/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build index 27ccbd6550..eed27b880a 100644 --- a/lib/librte_metrics/meson.build +++ b/lib/librte_metrics/meson.build @@ -8,7 +8,7 @@ jansson = dependency('jansson', required: false) if jansson.found() ext_deps += jansson sources += files('rte_metrics_telemetry.c') - headers = files('rte_metrics_telemetry.h') + headers += files('rte_metrics_telemetry.h') deps += ['ethdev', 'telemetry'] includes += include_directories('../librte_telemetry') endif -- 2.20.1