[gimp] meson: change option relocatable-bundle = yes|no|platform-default
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] meson: change option relocatable-bundle = yes|no|platform-default
- Date: Tue, 17 Mar 2020 17:50:59 +0000 (UTC)
commit 9032df515ba09a8e60cd544447792bf8c673d78c
Author: Jehan <jehan girinstud io>
Date: Tue Mar 17 18:48:54 2020 +0100
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.
meson.build | 6 +++---
meson_options.txt | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 75a33685b5..d4522fef5b 100644
--- a/meson.build
+++ b/meson.build
@@ -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.
diff --git a/meson_options.txt b/meson_options.txt
index 0bacddd83d..10255dc9ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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' ])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]