Commit 564d35fd authored by Jan Tojnar's avatar Jan Tojnar Committed by Jehan

meson: relocatable-bundle should not be a feature

When we build GIMP with `-Dauto_features=enabled` to ensure we have
fully-featured GIMP and to have it warn us when we are missing some
optional dependency, Meson also enables relocatable bundle.

This is unexpected since being relocatable is a binary property rather
than a feature. This patch switches it option to a combo type to make
it ignore auto_features option.
parent bed95ebc
Pipeline #161647 passed with stages
in 26 minutes and 16 seconds
......@@ -305,11 +305,11 @@ no_dep = dependency('', required: false)
################################################################################
# Mandatory Dependencies
if get_option('relocatable-bundle').enabled()
if get_option('relocatable-bundle') == 'enabled'
relocatable_bundle = true
elif get_option('relocatable-bundle').disabled()
elif get_option('relocatable-bundle') == 'disabled'
relocatable_bundle = false
else # .auto()
else # == 'auto'
# By default, assume building for Windows or macOS everything to be on
# the same prefix and can be relocated.
# On other platforms, build-time paths are meaningful.
......
......@@ -7,7 +7,9 @@ option('enable-multiproc', type: 'boolean', value: true, description: 'Suppor
option('profiling', type: 'boolean', value: false, description: 'Enable profiling')
option('windows-installer', type: 'boolean', value: false, description: 'Generate files needed for the Windows installer')
option('relocatable-bundle',type: 'feature', value: 'auto', description: 'build with resources considered bundled under the same prefix')
option('relocatable-bundle',type: 'combo', value: 'auto', description: 'build with resources considered bundled under the same prefix',
choices: [ 'enabled', 'disabled', 'auto' ]
)
option('shmem-type', type: 'combo', value: 'auto', description: 'Shared memory transport type',
choices: [ 'none', 'sysv', 'posix', 'win32', 'auto' ])
......
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