[libgda: 1/3] Fixing SQLite3 configuration
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda: 1/3] Fixing SQLite3 configuration
- Date: Sun, 31 May 2020 01:19:00 +0000 (UTC)
commit 7a8d996dde72c99763225387b5d3275d7548d82d
Author: Pavlo Solntsev <p sun fun gmail com>
Date: Tue May 26 00:07:17 2020 -0500
Fixing SQLite3 configuration
Since embedded SQLite was removed in f38e79825 we need a sqlite3
library system installed. Right now, libgda can't be build without
system installed library.
meson.build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7f022b634..9e4dc2116 100644
--- a/meson.build
+++ b/meson.build
@@ -112,14 +112,13 @@ lbdb_cargs = []
# endif
# endforeach
-sqlite_dep = dependency ('sqlite3', version: '>= 3.22.0', required: false)
-sqlite_internal = true
+sqlite_dep = dependency ('sqlite3', version: '>= 3.22.0', required: true)
if sqlite_dep.found()
- sqlite3_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
- dependencies: sqlite_dep)
+ if compiler.has_function('sqlite3_table_column_metadata', dependencies: sqlite_dep)
+ message('Installed SQLite was not compiled with the SQLITE_ENABLE_COLUMN_METADATA')
+ endif
endif
-
sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4', required: false)
if sqlcipher_dep.found() and not get_option('disable-sqlcipher')
sqlcipher_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]