diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-08-11 20:41:48 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-13 21:17:47 +0300 |
| commit | 556966003ebd95c275b8d2c889c1d8ac339f3d36 (patch) | |
| tree | f4484cb7048ae6b089fd0415fbb6d5719601455c /test cases | |
| parent | 60b83a5f0a0ac5c1f860df33b0698150b1779179 (diff) | |
| download | meson-556966003ebd95c275b8d2c889c1d8ac339f3d36.zip meson-556966003ebd95c275b8d2c889c1d8ac339f3d36.tar.gz meson-556966003ebd95c275b8d2c889c1d8ac339f3d36.tar.bz2 | |
gnome: Allow passing build_by_default: to some functions
Closes https://github.com/mesonbuild/meson/issues/2174
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/7 gnome/gir/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/resources/meson.build | 8 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/schemas/meson.build | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build index 2758541..0b26754 100644 --- a/test cases/frameworks/7 gnome/gir/meson.build +++ b/test cases/frameworks/7 gnome/gir/meson.build @@ -28,7 +28,8 @@ gnome.generate_gir( includes : ['GObject-2.0', 'MesonDep1-1.0'], # dep1_dep pulls in dep2_dep for us dependencies : [fake_dep, dep1_dep], - install : true + install : true, + build_by_default : true, ) test('gobject introspection/c', girexe) diff --git a/test cases/frameworks/7 gnome/resources/meson.build b/test cases/frameworks/7 gnome/resources/meson.build index fdf6f63..3ebb2f5 100644 --- a/test cases/frameworks/7 gnome/resources/meson.build +++ b/test cases/frameworks/7 gnome/resources/meson.build @@ -45,3 +45,11 @@ if glib.version() >= '2.52.0' dependencies: gio) test('generated resource test', generated_res_exe) endif + +# Test build_by_default +gnome.compile_resources('build-resources', + 'simple.gresource.xml', + gresource_bundle : true, + build_by_default : true, + source_dir : '../resources-data', +) diff --git a/test cases/frameworks/7 gnome/schemas/meson.build b/test cases/frameworks/7 gnome/schemas/meson.build index 1947604..9544a57 100644 --- a/test cases/frameworks/7 gnome/schemas/meson.build +++ b/test cases/frameworks/7 gnome/schemas/meson.build @@ -1,8 +1,7 @@ -compiled = gnome.compile_schemas() +compiled = gnome.compile_schemas(build_by_default: true) install_data('com.github.meson.gschema.xml', install_dir : 'share/glib-2.0/schemas') -schemaexe = executable('schemaprog', 'schemaprog.c', compiled, -dependencies : gio) +schemaexe = executable('schemaprog', 'schemaprog.c', dependencies : gio) test('schema test', schemaexe) |