From 9af3308ef3ecce199bb00dd40b515286ee6df4c7 Mon Sep 17 00:00:00 2001 From: Tim Eves Date: Mon, 29 Oct 2018 16:05:06 +0700 Subject: [PATCH] Fix a compiler warnings in context_api under clang and statically link. While dynamic linking works on linux & Mac OS due to rpath support Windows can't find the dll when debugging the test case unless it's copied into the tests builddir or it has it's working dir set to the DLL's builddir. --- .../keyboardprocessor/tests/unit/kmnkbd/context_api.cpp | 4 ++-- common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp b/common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp index ec747a5808..fed9e10476 100644 --- a/common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp +++ b/common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp @@ -30,8 +30,8 @@ namespace auto const bmp_ctxt_size = count_codepoints(initial_bmp_context), smp_ctxt_size = count_codepoints(initial_smp_context); km_kbp_context_item test_marker_ctxt[2] = { - {KM_KBP_CT_MARKER, {0,}, 0xDEADBEEF}, - {KM_KBP_CT_END, {0,}, 0} + {KM_KBP_CT_MARKER, {0,}, {0xDEADBEEF}}, + {KM_KBP_CT_END, {0,}, {0}} }; diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build b/common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build index f69b6bb335..a07cbbafa3 100644 --- a/common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build +++ b/common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build @@ -7,5 +7,5 @@ ctxt = executable('context-api', 'context_api.cpp', include_directories: [inc, libsrc], - dependencies: [kmnkbp]) + objects: lib.extract_objects('km_kbp_context_api.cpp', 'json.cpp')) test('context-api', ctxt)