Merge branch 'master' of github.com:akiraux/Akira

akiraux · Aug 4, 2020 · b5c67f2 · b5c67f2
2 parents 45b0019 + 7cd07d7
commit b5c67f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/meson.build b/meson.build
@@ -4,6 +4,7 @@ project('com.github.akiraux.akira', 'vala', 'c')
 akira_prefix = get_option('prefix')
 akira_datadir = join_paths(akira_prefix, get_option('datadir'))
 akira_pkgdatadir = join_paths(akira_datadir, meson.project_name())
+install_tests = get_option('install-tests')
 
 vala_version = meson.get_compiler('vala').version()
 if vala_version.version_compare('<=0.43.90')
@@ -67,6 +68,9 @@ add_global_arguments(['-DG_LOG_DOMAIN="Akira"'], language:'c')
 subdir('src')
 subdir('data')
 subdir('po')
-subdir('tests')
+
+if install_tests
+    subdir('tests')
+endif
 
 meson.add_install_script('build-aux/meson/post_install.py')
diff --git a/meson_options.txt b/meson_options.txt
@@ -1,9 +1,4 @@
-option(
-        'profile',
-        type: 'combo',
-        choices: [
-                'default',
-                'development'
-        ],
-        value: 'default'
-)
+option('profile', type: 'combo', choices: ['default', 'development'], value: 'default')
+
+option('install-tests', type : 'boolean', value : 'false',
+       description : 'install test executables')