[libgda] meson: fix sqlcipher build
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] meson: fix sqlcipher build
- Date: Fri, 8 Mar 2019 00:14:22 +0000 (UTC)
commit 61a6c326692b5eabeb9c4d6a3dbf2990579cb0f5
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date: Thu Mar 7 17:26:05 2019 -0600
meson: fix sqlcipher build
meson.build | 2 +-
providers/sqlcipher/meson.build | 3 +--
tests/providers/meson.build | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 66afb5ab7..a74bda5b7 100644
--- a/meson.build
+++ b/meson.build
@@ -116,7 +116,7 @@ endif
sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4', required: false)
-if sqlcipher_dep.found() and not get_option('disable-crypto')
+if sqlcipher_dep.found() and not get_option('disable-sqlcipher')
sqlcipher_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
required: true,
dependencies: sqlcipher_dep)
diff --git a/providers/sqlcipher/meson.build b/providers/sqlcipher/meson.build
index efaa9356c..c1dd684bf 100644
--- a/providers/sqlcipher/meson.build
+++ b/providers/sqlcipher/meson.build
@@ -104,7 +104,6 @@ libgda_sqlcipher_provider = library ('gda-sqlcipher-'+project_api_version,
dependencies: [
libgda_dep,
sqlcipher_deps,
- libcrypto_dep,
inc_libgda_sqlcipherh_dep,
inc_sqliteh_dep,
inc_libgdah_dep,
@@ -114,4 +113,4 @@ libgda_sqlcipher_provider = library ('gda-sqlcipher-'+project_api_version,
link_with: libgda,
install: true,
install_dir: join_paths(get_option('libdir'), project_package, 'providers')
- )
+ )
\ No newline at end of file
diff --git a/tests/providers/meson.build b/tests/providers/meson.build
index 45709e94b..0220ec2e1 100644
--- a/tests/providers/meson.build
+++ b/tests/providers/meson.build
@@ -29,7 +29,7 @@ test('ProviderSQLite', tchksqlite,
]
)
-if libcrypto_dep.found () and not get_option('disable-crypto')
+if sqlcipher_dep.found () and not get_option('disable-sqlcipher')
tchksqlcipher = executable('check_sqlcipher',
['check_sqlcipher.c']+providers_common_sources+common_sources+tests_sources,
@@ -183,4 +183,4 @@ test('ProviderMySQL', tchkmysql,
'GDA_TOP_BUILD_DIR='+meson.build_root()
]
)
-endif
+endif
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]