metrics: fix header installation with meson
authorCiara Power <ciara.power@intel.com>
Tue, 14 Jul 2020 12:39:12 +0000 (13:39 +0100)
committerDavid Marchand <david.marchand@redhat.com>
Fri, 17 Jul 2020 14:00:30 +0000 (16:00 +0200)
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 <ciara.power@intel.com>
Acked-by: David Marchand <david.marchand@redhat.com>
lib/librte_metrics/meson.build

index 27ccbd6..eed27b8 100644 (file)
@@ -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