From e4ea17bf1d1443269b1fc37f87afd54b30abb8e3 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 6 Jan 2025 15:54:19 -0800 Subject: [PATCH] templates: Use modern pkgconfig generator API --- mesonbuild/templates/cpptemplates.py | 5 +---- mesonbuild/templates/ctemplates.py | 5 +---- mesonbuild/templates/cudatemplates.py | 5 +---- mesonbuild/templates/fortrantemplates.py | 5 +---- mesonbuild/templates/objcpptemplates.py | 5 +---- mesonbuild/templates/objctemplates.py | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py index bb09bcb09..bf95f9a58 100644 --- a/mesonbuild/templates/cpptemplates.py +++ b/mesonbuild/templates/cpptemplates.py @@ -149,12 +149,9 @@ install_headers('{header_file}', subdir : '{header_dir}') pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) ''' diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py index 7cb2de551..b60e916b8 100644 --- a/mesonbuild/templates/ctemplates.py +++ b/mesonbuild/templates/ctemplates.py @@ -98,12 +98,9 @@ install_headers('{header_file}', subdir : '{header_dir}') pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) ''' diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py index 7db1e0bc6..4f0c606a4 100644 --- a/mesonbuild/templates/cudatemplates.py +++ b/mesonbuild/templates/cudatemplates.py @@ -149,12 +149,9 @@ install_headers('{header_file}', subdir : '{header_dir}') pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) ''' diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py index a6fd2ef31..f9aec7ef2 100644 --- a/mesonbuild/templates/fortrantemplates.py +++ b/mesonbuild/templates/fortrantemplates.py @@ -79,12 +79,9 @@ meson.override_dependency('{project_name}', {ltoken}_dep) pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) ''' diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py index be6c1fde0..7ea4c3f8e 100644 --- a/mesonbuild/templates/objcpptemplates.py +++ b/mesonbuild/templates/objcpptemplates.py @@ -98,12 +98,9 @@ install_headers('{header_file}', subdir : '{header_dir}') pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) ''' diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py index ff3aba10c..de0217f96 100644 --- a/mesonbuild/templates/objctemplates.py +++ b/mesonbuild/templates/objctemplates.py @@ -97,12 +97,9 @@ install_headers('{header_file}', subdir : '{header_dir}') pkg_mod = import('pkgconfig') pkg_mod.generate( - name : '{project_name}', - filebase : '{ltoken}', + shlib, description : 'Meson sample project.', subdirs : '{header_dir}', - libraries : shlib, - version : '{version}', ) '''