[retro-gtk] meson: Reorder options and directories
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] meson: Reorder options and directories
- Date: Mon, 26 Oct 2020 19:48:40 +0000 (UTC)
commit 4e27530cd24be2ccb6d46a8a64219b188ba3ac62
Author: Adrien Plazas <kekun plazas laposte net>
Date: Fri Oct 16 12:03:38 2020 +0200
meson: Reorder options and directories
This makes their definitions match their print order.
meson.build | 2 +-
meson_options.txt | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3d26ca62..c5a6c7ca 100644
--- a/meson.build
+++ b/meson.build
@@ -8,8 +8,8 @@ gnome = import('gnome')
prefix = get_option('prefix')
libdir = prefix / get_option('libdir')
-libexecdir = prefix / get_option('libexecdir')
libretrodir = libdir / 'libretro'
+libexecdir = prefix / get_option('libexecdir')
datadir = prefix / get_option('datadir')
confinc = include_directories('.')
diff --git a/meson_options.txt b/meson_options.txt
index c6fbfbb5..0c99f179 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,11 +1,3 @@
-# Dependencies
-option('pulseaudio', type: 'feature', value: 'enabled',
- description : 'Enable audio playback via PulseAudio')
-
-# Documentation and introspection
-option('introspection', type: 'boolean', value: 'true',
- description : 'Build introspection data (requires gobject-introspection)')
-
# Demos and binaries
option('demos', type: 'boolean', value: 'true',
description : 'Build demo programs')
@@ -13,8 +5,15 @@ option('build-tests', type: 'boolean', value: 'true',
description : 'Build tests')
option('install-tests', type: 'boolean', value: 'false',
description : 'Install tests')
+
+# Documentation and introspection
option('build-doc', type: 'boolean', value: 'false',
description : 'Build API reference documentation')
option('install-doc', type: 'boolean', value: 'false',
description : 'Install API reference documentation')
+option('introspection', type: 'boolean', value: 'true',
+ description : 'Build introspection data (requires gobject-introspection)')
+# Dependencies
+option('pulseaudio', type: 'feature', value: 'enabled',
+ description : 'Enable audio playback via PulseAudio')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]