summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-10-15 11:13:53 +0200
committerDave Davenport <qball@gmpclient.org>2017-10-15 11:13:53 +0200
commitd7bda011525940c02438f6ae4c239e53fd4d7c07 (patch)
treeddf6fb8871befe9bffec486822c3da58d668f263
parent2198d43199854e8b4d9b832c7edc66112c90ff8c (diff)
Fix merge
-rw-r--r--meson.build24
1 files changed, 13 insertions, 11 deletions
diff --git a/meson.build b/meson.build
index bc84a25b..8f53d42a 100644
--- a/meson.build
+++ b/meson.build
@@ -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