diff options
| author | Soapux <35306504+Soapux@users.noreply.github.com> | 2018-03-23 21:30:47 -0500 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2018-03-27 09:33:04 +0100 |
| commit | 6a16dad69dd11f07f4a9fea9a94901df36665018 (patch) | |
| tree | 1a69b28af4d8d86e9ee3bf978e975c49d986f141 /contrib | |
| parent | f919d587e853f4c4485272708a069eb175353421 (diff) | |
| download | colord-6a16dad69dd11f07f4a9fea9a94901df36665018.tar.gz | |
Update style of Meson build options
Following the style guidelines here: https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
Also update the README with meson instructions for compiling on Linux.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/ci/build_and_test.sh | 10 | ||||
| -rw-r--r-- | contrib/colord.spec.in | 16 | ||||
| -rw-r--r-- | contrib/meson.build | 2 | ||||
| -rw-r--r-- | contrib/session-helper/meson.build | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh index 5ae9515..4e97f75 100755 --- a/contrib/ci/build_and_test.sh +++ b/contrib/ci/build_and_test.sh @@ -4,11 +4,11 @@ export LC_ALL=C.UTF-8 mkdir -p build && cd build rm * -rf meson .. \ - -Denable-vala=true \ - -Denable-print-profiles=false \ - -Denable-argyllcms-sensor=false \ - -Denable-sane=true \ - -Denable-libcolordcompat=true $@ + -Dvapi=true \ + -Dprint_profiles=false \ + -Dargyllcms_sensor=false \ + -Dsane=true \ + -Dlibcolordcompat=true $@ ninja -v || bash ninja test -v DESTDIR=/tmp/install-ninja ninja install diff --git a/contrib/colord.spec.in b/contrib/colord.spec.in index 2225424..c61e19e 100644 --- a/contrib/colord.spec.in +++ b/contrib/colord.spec.in @@ -116,23 +116,23 @@ This may be useful for CMYK soft-proofing or for extra device support. ulimit -Sv 2000000 %meson \ - -Denable-vala=true \ + -Dvapi=true \ %if 0%{?build_print_profiles} - -Denable-print-profiles=true \ + -Dprint_profiles=true \ %else - -Denable-print-profiles=false \ + -Dprint_profiles=false \ %endif %if 0%{?enable_sane} - -Denable-sane=true \ + -Dsane=true \ %endif %if 0%{?rhel} - -Denable-bash-completion=false \ - -Denable-argyllcms-sensor=false \ + -Dbash_completion=false \ + -Dargyllcms_sensor=false \ %endif %if !0%{?rhel} - -Denable-libcolordcompat=true \ + -Dlibcolordcompat=true \ %endif - -Dwith-daemon-user=colord + -Ddaemon_user=colord %meson_build diff --git a/contrib/meson.build b/contrib/meson.build index 740bf14..bb524bf 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -1,5 +1,5 @@ subdir('session-helper') -if get_option('enable-sane') +if get_option('sane') subdir('colord-sane') endif diff --git a/contrib/session-helper/meson.build b/contrib/session-helper/meson.build index 2ce7b23..66e6e5b 100644 --- a/contrib/session-helper/meson.build +++ b/contrib/session-helper/meson.build @@ -13,7 +13,7 @@ con2 = configuration_data() con2.set('servicedir', libexecdir) # replace @servicedir@ -if get_option('enable-systemd') +if get_option('systemd') configure_file( input : 'colord-session.service.in', output : 'colord-session.service', @@ -63,7 +63,7 @@ executable( install_data('org.freedesktop.ColorHelper.gschema.xml', install_dir : 'share/glib-2.0/schemas') -if get_option('enable-session-example') +if get_option('session_example') executable( 'colord-session-example', sources : [ |