diff --git a/contrib/meson/contrib/gen_html/meson.build b/contrib/meson/contrib/gen_html/meson.build index 086b8f05..38ed5276 100644 --- a/contrib/meson/contrib/gen_html/meson.build +++ b/contrib/meson/contrib/gen_html/meson.build @@ -16,7 +16,7 @@ contrib_gen_html_dir = join_paths(zstd_source_dir, 'contrib', 'gen_html') gen_html_includes = include_directories(programs_dir, library_dir, library_common_dir, - contrib_gen_html_dir ) + contrib_gen_html_dir) gen_html = executable('gen_html', join_paths(contrib_gen_html_dir, 'gen_html.cpp'), diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index b9ac8828..48f8d570 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -52,10 +52,17 @@ enable_zlib = get_option('zlib_support') enable_lzma = get_option('lzma_support') # ============================================================================= -# Getting project version from zstd.h +# Helper scripts for Meson # ============================================================================= GetZstdLibraryVersion_py = files('GetZstdLibraryVersion.py') +CreateSymlink_py = files('CreateSymlink.py') +CopyFile_py = files('CopyFile.py') + +# ============================================================================= +# Getting project version from zstd.h +# ============================================================================= + zstd_h_file = join_paths(library_dir, 'zstd.h') r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file) if r.returncode() == 0 diff --git a/contrib/meson/meson_options.txt b/contrib/meson/meson_options.txt index 1d28c71a..6e935857 100644 --- a/contrib/meson/meson_options.txt +++ b/contrib/meson/meson_options.txt @@ -9,7 +9,7 @@ # ############################################################################# option('multithread_support', type: 'boolean', value: true, - description: 'Enable multithreading when pthread is detected') + description: 'Enable multi-threading when pthread is detected') option('legacy_support', type: 'string', value: '4', description: 'Support any legacy format: true or false, or 7 to 1 for v0.7+ to v0.1+') option('build_programs', type: 'boolean', value: true, diff --git a/contrib/meson/programs/meson.build b/contrib/meson/programs/meson.build index 63ea328a..8130ab15 100644 --- a/contrib/meson/programs/meson.build +++ b/contrib/meson/programs/meson.build @@ -61,8 +61,6 @@ executable('zstd-frugal', # Program symlinks # ============================================================================= -CreateSymlink_py = join_paths(meson.current_source_dir(), '..', 'CreateSymlink.py') - foreach f : [ 'zstdcat', 'unzstd' ] custom_target(f, output : f, @@ -89,7 +87,6 @@ endif zstd_man1_dir = join_paths(zstd_mandir, 'man1') zstd_1_file = join_paths(programs_dir, 'zstd.1') -CopyFile_py = join_paths(meson.current_source_dir(), '..', 'CopyFile.py') custom_target('zstd.1', output : 'zstd.1',