[libgda: 1/2] Meson: Fix sqlcipher and sqlite pkg-config file generation
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda: 1/2] Meson: Fix sqlcipher and sqlite pkg-config file generation
- Date: Sat, 18 Sep 2021 15:32:36 +0000 (UTC)
commit 3e0c7583ddcc3649f24ad1f1b5d851072fd3f721
Author: Chris Mayo <aklhfex gmail com>
Date: Fri Sep 17 19:39:32 2021 +0100
Meson: Fix sqlcipher and sqlite pkg-config file generation
Add missing input file arguments.
providers/sqlcipher/meson.build | 6 +++++-
providers/sqlite/meson.build | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/providers/sqlcipher/meson.build b/providers/sqlcipher/meson.build
index e7b3be8fb..7a3e74a77 100644
--- a/providers/sqlcipher/meson.build
+++ b/providers/sqlcipher/meson.build
@@ -97,10 +97,14 @@ sqlcipher_cargs += [
sqlcipher_cargs += c_args
-libgda_sqlcipher_providerpc = configure_file(output : 'libgda-sqlcipher-'+project_api_version+'.pc',
+libgda_sqlcipher_providerpc_name = 'libgda-sqlcipher-'+project_api_version+'.pc'
+libgda_sqlcipher_providerpc = configure_file(
+ input : libgda_sqlcipher_providerpc_name+'.in',
+ output : libgda_sqlcipher_providerpc_name,
configuration : conf,
install_dir: join_paths(get_option('libdir'),'pkgconfig')
)
+
libgda_sqlcipher_provider = library ('gda-sqlcipher-'+project_api_version,
libgda_sqlcipher_sources,
dependencies: [
diff --git a/providers/sqlite/meson.build b/providers/sqlite/meson.build
index cdc778f61..f4eb3d02c 100644
--- a/providers/sqlite/meson.build
+++ b/providers/sqlite/meson.build
@@ -58,7 +58,10 @@ libgda_sqlite_sources = files([
])
libgda_sqlite_sources += sqlite_resources
-libgda_sqlite_providerpc = configure_file(output : 'libgda-sqlite-'+project_api_version+'.pc',
+libgda_sqlite_providerpc_name = 'libgda-sqlite-'+project_api_version+'.pc'
+libgda_sqlite_providerpc = configure_file(
+ input : libgda_sqlite_providerpc_name+'.in',
+ output : libgda_sqlite_providerpc_name,
configuration : conf,
install_dir: join_paths(get_option('libdir'),'pkgconfig')
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]