mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-05 00:15:32 +00:00
refactor(core): move utfcodec to common
Refactor to support codecvt cleanup work in kmcmplib.
This commit is contained in:
parent
2993e2975f
commit
613bdb6c19
6 changed files with 7 additions and 4 deletions
|
|
@ -20,7 +20,7 @@ if hotdoc.found()
|
|||
deps = files(
|
||||
'../include/keyman/keyman_core_api.h',
|
||||
'../src/jsonpp.hpp',
|
||||
'../src/utfcodec.hpp'
|
||||
'../../common/cpp/utfcodec.hpp'
|
||||
)
|
||||
|
||||
docs = custom_target('docs',
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ core_files = files(
|
|||
'keyboard.cpp',
|
||||
'state.cpp',
|
||||
'jsonpp.cpp',
|
||||
'utfcodec.cpp',
|
||||
'../../common/cpp/utfcodec.cpp',
|
||||
)
|
||||
|
||||
mock_files = files(
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@
|
|||
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(join_paths('../', 'src'))
|
||||
libsrc = include_directories(
|
||||
'../src',
|
||||
'../../common/include'
|
||||
)
|
||||
|
||||
# kmx_test_source is required for linux builds, so always enable it even when we
|
||||
# disable all other tests
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
#
|
||||
|
||||
e = executable('utftest', 'utftest.cpp',
|
||||
objects: lib.extract_objects('utfcodec.cpp'),
|
||||
objects: lib.extract_objects('../../common/cpp/utfcodec.cpp'),
|
||||
include_directories: [libsrc])
|
||||
test('utftest', e)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue