Commit 9032df51 authored by Jehan's avatar Jehan

meson: change option relocatable-bundle = yes|no|platform-default

As discussed in patch !208. Now that the feature is implemented as a
meson combo, let's have (hopefully) clearer values than
enabled|disabled|auto.
parent 564d35fd
Pipeline #161649 passed with stages
in 33 minutes and 7 seconds
......@@ -305,11 +305,11 @@ no_dep = dependency('', required: false)
################################################################################
# Mandatory Dependencies
if get_option('relocatable-bundle') == 'enabled'
if get_option('relocatable-bundle') == 'yes'
relocatable_bundle = true
elif get_option('relocatable-bundle') == 'disabled'
elif get_option('relocatable-bundle') == 'no'
relocatable_bundle = false
else # == 'auto'
else # == 'platform-default'
# 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,9 +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: 'combo', value: 'auto', description: 'build with resources considered bundled under the same prefix',
choices: [ 'enabled', 'disabled', 'auto' ]
)
option('relocatable-bundle', type: 'combo', value: 'platform-default',
description: 'build with resources considered bundled under the same prefix',
choices: [ 'yes', 'no', 'platform-default' ])
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