Skip to content

Commit

Permalink
fix(core): cleanup include directories
Browse files Browse the repository at this point in the history
This fixes a meson warning that `common/include` was specified
multiple times (in `core/include/meson.build` and
`core/tests/meson.build`).
  • Loading branch information
ermshiperete committed Oct 16, 2024
1 parent 8ab2b8b commit ba7589e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions core/tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/tests/unit/json/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion core/tests/unit/utftest/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit ba7589e

Please sign in to comment.