From 5a36a57cf5b710d82679cffd64f51080c14fe4c0 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Wed, 28 Nov 2018 11:57:53 +0700 Subject: [PATCH] Bump to 1.3.8 and fix run_command function The run_command is run from an unspecified directory. Therefore we cannot assume which directory it is running our command. --- contrib/meson/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index 48f8d570d..bd7eeff73 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -14,7 +14,7 @@ project('zstd', default_options : ['c_std=c99', 'cpp_std=c++11', 'buildtype=release'], - version: '1.3.7', + version: '1.3.8', # for install_man meson_version: '>=0.47.0') @@ -63,7 +63,7 @@ CopyFile_py = files('CopyFile.py') # Getting project version from zstd.h # ============================================================================= -zstd_h_file = join_paths(library_dir, 'zstd.h') +zstd_h_file = join_paths(meson.current_source_dir(), library_dir, 'zstd.h') r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file) if r.returncode() == 0 output = r.stdout().strip()