Fix merge

This commit is contained in:
Dave Davenport 2017-10-15 11:13:53 +02:00
parent 2198d43199
commit d7bda01152
1 changed files with 13 additions and 11 deletions

View File

@ -119,6 +119,7 @@ install_headers([
'include/mode.h',
'include/mode-private.h',
'include/helper.h',
'include/rofi-types.h',
],
subdir: meson.project_name(),
)
@ -286,17 +287,6 @@ test('helper_pidfile test', executable('helper_pidfile.test', [
dependencies: deps,
))
test('helper_tokenize test', executable('helper_tokenize.test', [
'test/helper-tokenize.c',
],
objects: rofi.extract_objects([
'config/config.c',
'source/helper.c',
'source/xrmoptions.c',
'source/rofi-types.c',
]),
dependencies: deps,
))
test('widget test', executable('widget.test', [
'test/widget-test.c',
@ -433,6 +423,18 @@ if check.found()
]),
dependencies: deps,
))
test('helper_tokenize test', executable('helper_tokenize.test', [
'test/helper-tokenize.c',
],
objects: rofi.extract_objects([
'config/config.c',
'source/helper.c',
'source/xrmoptions.c',
'source/rofi-types.c',
]),
dependencies: deps,
))
endif