From f8d95f2fd5c5bf007a385157ba2a1bbcc8a63d6f Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Mon, 11 May 2020 15:11:23 +0000 Subject: [PATCH] Allow user to change their lua version --- README.md | 7 +++++++ meson.build | 2 +- meson_options.txt | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d1008a2..1cf1ca8 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,13 @@ $ meson build $ ninja -C build ``` +If you plan to use luajit instead, use the following commands instead. + +``` +$ meson -Dlua-pkg=luajit build +$ ninja -C build +``` + Installing is accomplished with the following command: ``` diff --git a/meson.build b/meson.build index 32a76a3..4cd3d7c 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,7 @@ add_project_arguments( ) git = find_program('git', required: false) -lua = dependency('lua') +lua = dependency(get_option('lua-pkg')) wayland_client = dependency('wayland-client') wayland_protocols = dependency('wayland-protocols') wayland_scanner = dependency('wayland-scanner') diff --git a/meson_options.txt b/meson_options.txt index 0a890cf..1096647 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1 +1,2 @@ option('kiwmi-version', type: 'string', description: 'The version string reported in `kiwmi -v`.') +option('lua-pkg', type: 'string', value: 'lua', description: 'The Lua version to use.')