diff options
| author | Richard Hughes <richard@hughsie.com> | 2018-03-12 13:11:21 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2018-03-12 13:11:21 +0000 |
| commit | fc1cf63286f7f8ab3e291be45a31c84c00cce4ef (patch) | |
| tree | 39f2d85ab71c9fd0afe96d09eb003cd0540cbc59 | |
| parent | 4de1fd10d4fcc17188af7558ea95ea8d766c2682 (diff) | |
| download | gnome-color-manager-fc1cf63286f7f8ab3e291be45a31c84c00cce4ef.tar.gz | |
Use the short-form meson configure argument style
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 6 | ||||
| -rw-r--r-- | src/gcm-utils.c | 2 | ||||
| -rw-r--r-- | src/meson.build | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 3858b23..5fd849f 100644 --- a/meson.build +++ b/meson.build @@ -102,12 +102,12 @@ if libvte.found() conf.set('HAVE_VTE', '1') endif -if get_option('enable-exiv') +if get_option('exiv') libexiv = dependency('exiv2') conf.set('HAVE_EXIV', '1') endif -if get_option('enable-packagekit') +if get_option('packagekit') libexiv = dependency('exiv2') conf.set('HAVE_PACKAGEKIT', '1') endif diff --git a/meson_options.txt b/meson_options.txt index 9e29ae7..1c2cf1c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ -option('enable-tests', type : 'boolean', value : true, description : 'enable tests') -option('enable-exiv', type : 'boolean', value : true, description : 'enable EXIV support for RAW support') -option('enable-packagekit', type : 'boolean', value : true, description : 'enable PackageKit integration') +option('tests', type : 'boolean', value : true, description : 'enable tests') +option('exiv', type : 'boolean', value : true, description : 'enable EXIV support for RAW support') +option('packagekit', type : 'boolean', value : true, description : 'enable PackageKit integration') diff --git a/src/gcm-utils.c b/src/gcm-utils.c index 43b07af..e7718b0 100644 --- a/src/gcm-utils.c +++ b/src/gcm-utils.c @@ -92,7 +92,7 @@ gcm_utils_install_package (const gchar *package_name, GtkWindow *window) g_return_val_if_fail (package_name != NULL, FALSE); #ifndef HAVE_PACKAGEKIT - g_warning ("cannot install %s: this package was not compiled with --enable-packagekit", package_name); + g_warning ("cannot install %s: this package was not compiled with --packagekit", package_name); return FALSE; #endif diff --git a/src/meson.build b/src/meson.build index 73ba87c..7f9fcaf 100644 --- a/src/meson.build +++ b/src/meson.build @@ -14,7 +14,7 @@ gcm_viewer_resources = gnome.compile_resources( c_name : 'gcm', ) -if get_option('enable-exiv') +if get_option('exiv') executable( 'gcm-helper-exiv', sources : [ @@ -167,7 +167,7 @@ executable( install : true, ) -if get_option('enable-tests') +if get_option('tests') cargs += ['-DTESTDATADIR="' + join_paths(meson.current_source_dir(), '..', 'data', 'tests') + '"'] e = executable( 'gcm-self-test', |