diff options
author | Jens Georg <mail@jensge.org> | 2019-08-23 18:29:16 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2019-08-23 18:35:07 +0200 |
commit | 13e45f94860461cadca89f2088bad65b5730bee8 (patch) | |
tree | dc4f1a53379c7d5da6117e2cb4af22d21552958d | |
parent | 9db998ff5ceadb62fd1898a84c68894d986556e3 (diff) | |
download | rygel-13e45f94860461cadca89f2088bad65b5730bee8.tar.gz |
build: Add option to disable introspection
Fixes #143
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | meson_options.txt | 1 | ||||
-rw-r--r-- | src/librygel-core/meson.build | 2 | ||||
-rw-r--r-- | src/librygel-renderer-gst/meson.build | 2 | ||||
-rw-r--r-- | src/librygel-renderer/meson.build | 2 | ||||
-rw-r--r-- | src/librygel-server/meson.build | 4 |
6 files changed, 11 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 85573e6c..4c8e4a9f 100644 --- a/meson.build +++ b/meson.build @@ -110,7 +110,7 @@ endif posix = vala.find_library('posix') sed = find_program('sed') -g_ir_compiler = find_program('g-ir-compiler') +g_ir_compiler = find_program('g-ir-compiler', required: get_option('introspection')) gir_dir = join_paths(get_option('datadir'), 'gir-1.0') typelib_dir = join_paths(get_option('libdir'), 'girepository-1.0') pkgconfig_dir = join_paths(get_option('libdir'), 'pkgconfig') diff --git a/meson_options.txt b/meson_options.txt index f09cac58..b987ee51 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,3 +7,4 @@ option('examples', type : 'boolean', value : 'true') option('tests', type : 'boolean', value : 'true') option('gstreamer', type : 'boolean', value : 'true') option('gtk', type : 'boolean', value : 'true') +option('introspection', type: 'feature', value : 'auto') diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build index 048ac35d..191c57f6 100644 --- a/src/librygel-core/meson.build +++ b/src/librygel-core/meson.build @@ -49,6 +49,7 @@ core_lib = library('rygel-core-2.6', core_sources, install_dir : [true, rygel_includedir, true, false]) install_data('rygel-core-2.6.deps', install_dir : rygel_vapidir) +if g_ir_compiler.found() # Step two: Do the namespace magic with sed # We cannot use input: here since the generated ninja build file does not seem # to know that Rygel-2.6.gir is a result of building rygel-core-2.6 target @@ -74,6 +75,7 @@ custom_target('RygelCore-2.6.typelib', depends: core_gir, install: true, install_dir: typelib_dir) +endif # need to add to get the current build dir as include dir rygel_core = declare_dependency(include_directories: include_directories('.'), diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build index 4feaa83f..45f68cde 100644 --- a/src/librygel-renderer-gst/meson.build +++ b/src/librygel-renderer-gst/meson.build @@ -13,6 +13,7 @@ renderer_gst_lib = library('rygel-renderer-gst-2.6', renderer_gst_sources, install_dir : [true, rygel_includedir, true, false]) install_data('rygel-renderer-gst-2.6.deps', install_dir : rygel_vapidir) +if g_ir_compiler.found() # For details on the GIR/typelib generating process, see # librygel-core/meson.build renderer_gst_gir = custom_target('RygelRendererGst-2.6.gir', @@ -40,6 +41,7 @@ custom_target('RygelRendererGst-2.6.typelib', depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir], install: true, install_dir: typelib_dir) +endif rygel_renderer_gst = declare_dependency(include_directories : include_directories('.'), dependencies : renderer_gst_deps, diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build index 37d46b46..742c50f3 100644 --- a/src/librygel-renderer/meson.build +++ b/src/librygel-renderer/meson.build @@ -22,6 +22,7 @@ renderer_lib = library('rygel-renderer-2.6', renderer_sources, install_dir : [true, rygel_includedir, true, false]) install_data('rygel-renderer-2.6.deps', install_dir : rygel_vapidir) +if g_ir_compiler.found() # For details on the GIR / typelib generation process, see # librygel-core/meson.build renderer_gir = custom_target('RygelRenderer-2.6.gir', @@ -47,6 +48,7 @@ custom_target('RygelRenderer-2.6.typelib', depends: renderer_gir, install: true, install_dir: typelib_dir) +endif rygel_renderer = declare_dependency(include_directories : include_directories('.'), diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build index 66a75698..5f5a1f06 100644 --- a/src/librygel-server/meson.build +++ b/src/librygel-server/meson.build @@ -99,7 +99,7 @@ server_lib = library('rygel-server-2.6', server_sources, install_dir : [true, rygel_includedir, true, false]) install_data('rygel-server-2.6.deps', install_dir : rygel_vapidir) - +if g_ir_compiler.found() # For details on the GIR/typelib generation process, see # librygel-core/meson.build server_gir = custom_target('RygelServer-2.6.gir', @@ -128,6 +128,8 @@ custom_target('RygelServer-2.6.typelib', install: true, install_dir: typelib_dir) +endif + # need to add to get the current build dir as include dir rygel_server = declare_dependency(include_directories: include_directories('.'), dependencies : server_deps, |