[atkmm/atkmm-2-28] meson.build: Specify 'check' option in run_command(), part 2
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atkmm/atkmm-2-28] meson.build: Specify 'check' option in run_command(), part 2
- Date: Sat, 12 Feb 2022 12:13:13 +0000 (UTC)
commit 2dd441b8412b78004e5dafcc45eb92bb0f4ca3f1
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Sat Feb 12 13:11:20 2022 +0100
meson.build: Specify 'check' option in run_command(), part 2
Forgot one run_command() in the first part.
Let import('python').find_installation() always find the python
installation used to run Meson.
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 865744a..0b8ca80 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@ project_build_root = meson.current_build_dir()
cpp_compiler = meson.get_compiler('cpp')
is_msvc = cpp_compiler.get_id() == 'msvc'
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
python_version = python3.language_version()
python_version_req = '>= 3.5'
@@ -198,7 +198,7 @@ if is_msvc
# Enable __declspec(dllexport) if the atkmm headers generated from the .hg files
# were generated using a recent enough gmmproc
- build_shared_libs_directly = run_command(check_gmmproc_ver_cmd).returncode() == 0
+ build_shared_libs_directly = run_command(check_gmmproc_ver_cmd, check: false).returncode() == 0
message('Using __declspec(dllexport) to build atkmm: @0@'.format(build_shared_libs_directly ? 'YES' :
'NO'))
if use_msvc14x_toolset_ver
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]