From d00d8fff6b3e7e596cc399e2c49350f90977c931 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Fri, 12 Apr 2024 22:39:43 +0900 Subject: [PATCH] subprojects: webview2: Fix warning with meson 1.4.0 Meson 1.4.0 will warn if include dir is absolute path Part-of: --- subprojects/webview2/meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/subprojects/webview2/meson.build b/subprojects/webview2/meson.build index bc7e5b5018..bac6a33766 100644 --- a/subprojects/webview2/meson.build +++ b/subprojects/webview2/meson.build @@ -1,4 +1,4 @@ -project('webview2', version : '1.0.2420.47') +project('webview2', 'c', version : '1.0.2420.47') py3 = import('python3').find_python() @@ -9,28 +9,28 @@ endif message('Downloading and extracting webview2 nuget package') arch = target_machine.cpu_family() -if arch != 'x86_64' and arch != 'x86' and arch != 'aarch64' - error('Unexpected architecture' + arch) +if arch not in ['x86_64', 'x86', 'aarch64'] + error(f'Unexpected architecture @arch@') endif zip_hash = '8e5a7307d71507edbbe02cac27215d71058bbd82cd256cef60f06b945907610a' version = meson.project_version() -ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash, +ret = run_command(py3, files('download-binary.py'), version, zip_hash, check: true) -base_path = join_paths(meson.current_source_dir(), 'webview2-@0@'.format(version), - 'build', 'native') -inc_dir = include_directories(join_paths(base_path, 'include')) +base_path = f'webview2-@version@' / 'build' / 'native' +inc_dir = include_directories(base_path / 'include') +lib_base_path = meson.current_source_dir() / base_path lib_path = '' if arch == 'x86_64' - lib_path = join_paths(base_path, 'x64') + lib_path = lib_base_path / 'x64' elif arch == 'x86' - lib_path = join_paths(base_path, 'x86') + lib_path = lib_base_path / 'x86' else - lib_path = join_paths(base_path, 'arm64') + lib_path = lib_base_path / 'arm64' endif cc = meson.get_compiler('c') -loader_static = cc.find_library('WebView2LoaderStatic', dirs: [lib_path]) +loader_static = cc.find_library('WebView2LoaderStatic', dirs: lib_path) webview2_dep = declare_dependency(include_directories: inc_dir, dependencies: loader_static)