Merge branch 'master' into highlight-today

elementary · Nov 4, 2020 · 1c399eb · 1c399eb
2 parents 5cc36b2 + 2c124b2
commit 1c399eb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/lib/meson.build b/lib/meson.build
@@ -98,24 +98,26 @@ install_data(
     install_dir: include_dir
 )
 
-# typelib generation isn't automated yet
-g_ir_compiler = find_program('g-ir-compiler')
-custom_target(
-    granite_typelib,
-    command: [
-        g_ir_compiler,
-        '--shared-library',
-        '@PLAINNAME@',
-        '--output',
-        '@OUTPUT@',
-        join_paths(meson.current_build_dir(), granite_gir),
-    ],
-    input: libgranite,
-    output: granite_typelib,
-    depends: libgranite,
-    install: true,
-    install_dir: join_paths(get_option('libdir'), 'girepository-1.0'),
-)
+if get_option('introspection')
+    # typelib generation isn't automated yet
+    g_ir_compiler = find_program('g-ir-compiler')
+    custom_target(
+        granite_typelib,
+        command: [
+            g_ir_compiler,
+            '--shared-library',
+            '@PLAINNAME@',
+            '--output',
+            '@OUTPUT@',
+            join_paths(meson.current_build_dir(), granite_gir),
+        ],
+        input: libgranite,
+        output: granite_typelib,
+        depends: libgranite,
+        install: true,
+        install_dir: join_paths(get_option('libdir'), 'girepository-1.0'),
+    )
+endif
 
 libgranite_dep = declare_dependency(
     link_with: libgranite,

diff --git a/meson_options.txt b/meson_options.txt
@@ -1 +1,2 @@
 option('documentation', type: 'boolean', value: false, description: 'generate documentation with gtk-doc and valadoc')
+option('introspection', type: 'boolean', value: true, description: 'Whether to build introspection files')
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		option('documentation', type: 'boolean', value: false, description: 'generate documentation with gtk-doc and valadoc')
		option('introspection', type: 'boolean', value: true, description: 'Whether to build introspection files')