From ba7589e6b6ead09f6b32a6003a99fcb96ad19523 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 16 Oct 2024 20:41:23 +0200 Subject: [PATCH] fix(core): cleanup include directories This fixes a meson warning that `common/include` was specified multiple times (in `core/include/meson.build` and `core/tests/meson.build`). --- core/tests/meson.build | 5 +---- core/tests/unit/json/meson.build | 2 +- core/tests/unit/utftest/meson.build | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/tests/meson.build b/core/tests/meson.build index 90e0ab2a54b..5ad808e1b2c 100644 --- a/core/tests/meson.build +++ b/core/tests/meson.build @@ -10,10 +10,7 @@ cmpfiles = ['-c', 'import sys; a = open(sys.argv[1], \'r\').read(); b = open(sys.argv[2], \'r\').read(); exit(not (a==b))'] stnds = join_paths(meson.current_source_dir(), 'standards') -libsrc = include_directories( - '../src', - '../../common/include' -) +libsrc = include_directories('../src') # kmx_test_source is required for linux builds, so always enable it even when we # disable all other tests diff --git a/core/tests/unit/json/meson.build b/core/tests/unit/json/meson.build index 6289d7db0cb..aaed69104e1 100644 --- a/core/tests/unit/json/meson.build +++ b/core/tests/unit/json/meson.build @@ -11,7 +11,7 @@ else endif e = executable('jsontest', 'jsontest.cpp', - include_directories: [libsrc], + include_directories: [inc, libsrc], link_args: links + tests_flags, objects: lib.extract_objects('jsonpp.cpp')) test('jsontest', e, args: 'jsontest.json') diff --git a/core/tests/unit/utftest/meson.build b/core/tests/unit/utftest/meson.build index 4ab6cb74ca0..35ad47fed05 100644 --- a/core/tests/unit/utftest/meson.build +++ b/core/tests/unit/utftest/meson.build @@ -6,5 +6,5 @@ e = executable('utftest', 'utftest.cpp', objects: lib.extract_objects('../../common/cpp/utfcodec.cpp'), - include_directories: [libsrc]) + include_directories: [inc, libsrc]) test('utftest', e)