Commit 9c20c463 authored by Jens Georg's avatar Jens Georg

Drop enable- prefix from meson options

parent d801b449
......@@ -23,7 +23,7 @@
override_dh_auto_configure:
rm -rf debian/build
mkdir debian/build
meson debian/build --prefix=/usr -Denable-unity-support=true -Dinstall-apport-hook=true
meson debian/build --prefix=/usr -Dunity-support=true -Dinstall-apport-hook=true
override_dh_auto_compile:
ninja -C -v debian/build
......
......@@ -57,7 +57,7 @@ libexif = dependency('libexif', version : '>= 0.6.16')
unity = dependency('unity', required : false)
unity_available = false
if unity.found() and get_option('enable-unity-support')
if unity.found() and get_option('unity-support')
unity_available = true
add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
endif
......@@ -77,7 +77,7 @@ foreach measure : get_option('measure').split(',')
language : 'vala')
endforeach
if get_option('disable-dupe-detection')
if not get_option('dupe-detection')
add_global_arguments(['--define=NO_DUPE_DETECTION'], language : vala)
endif
......
option('enable-unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
option('unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
option('publishers', type: 'string', value : 'facebook,flickr,picasa,piwigo,youtube,gallery3,tumblr', description: 'The list of publishing plugins to build')
option('enable-extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of extra publishing plugins')
option('extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of extra publishing plugins')
option('trace', type: 'string', value : '', description: 'Enable various trace options (available: dtors, import, md5, metadata-writer, monitoring, pixbuf-cache, reflow, reflow-items)')
option('measure', type: 'string', value : '', description : 'Enable various timing measurements(available : enhance, import, pipeline, view-filtering, thumbnail-cache)')
option('disable-dupe-detection', type: 'boolean', value : 'false', description: 'Disable duplicate checks')
option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
......@@ -18,7 +18,7 @@ sw_plugin_common_dep = declare_dependency(include_directories : include_director
subdir('authenticator')
subdir('shotwell-publishing')
if get_option('enable-extra-plugins')
if get_option('extra-plugins')
subdir('shotwell-publishing-extras')
endif
subdir('shotwell-transitions')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment