From e94131ac32dcc32c4b6f4a22fd7cce1a23095e2b Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Tue, 23 Jun 2020 10:58:19 +0200 Subject: [PATCH] Add SQLiteCpp subproject --- .gitmodules | 3 +++ src/main.cpp | 1 + src/meson.build | 6 +++++- subprojects/SQLiteCpp/SQLiteCpp | 1 + subprojects/SQLiteCpp/meson.build | 26 ++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 160000 subprojects/SQLiteCpp/SQLiteCpp create mode 100644 subprojects/SQLiteCpp/meson.build diff --git a/.gitmodules b/.gitmodules index 1846834..9add61b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "subprojects/date"] path = subprojects/date url = https://github.com/HowardHinnant/date.git +[submodule "subprojects/SQLiteCpp/SQLiteCpp"] + path = subprojects/SQLiteCpp/SQLiteCpp + url = https://github.com/SRombauts/SQLiteCpp.git diff --git a/src/main.cpp b/src/main.cpp index eb0d2d0..9c756b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ #include "oro/api.hpp" #include "orotool_config.hpp" +#include "SQLiteCpp/SQLiteCpp.h" #include int main(int argc, char* argv[]) { diff --git a/src/meson.build b/src/meson.build index 5b110d0..d0a173b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,6 +5,10 @@ restc_cpp_dep = dependency('restc-cpp', version: '>=0.1.1', ], ) +sqlitecpp_dep = dependency('sqlitecpp', version: '>=3.0.0', + fallback: ['SQLiteCpp', 'sqlitecpp_dep'], +) + base_url = get_option('base_url').strip() if not base_url.endswith('/') base_url = base_url + '/' @@ -27,6 +31,6 @@ executable(meson.project_name(), 'oro/shops.cpp', project_config_file, install: true, - dependencies: [restc_cpp_dep], + dependencies: [restc_cpp_dep, sqlitecpp_dep], include_directories: date_incdir, ) diff --git a/subprojects/SQLiteCpp/SQLiteCpp b/subprojects/SQLiteCpp/SQLiteCpp new file mode 160000 index 0000000..f757b64 --- /dev/null +++ b/subprojects/SQLiteCpp/SQLiteCpp @@ -0,0 +1 @@ +Subproject commit f757b640b1a900544241346fe4711de7cb5c8ffd diff --git a/subprojects/SQLiteCpp/meson.build b/subprojects/SQLiteCpp/meson.build new file mode 100644 index 0000000..08dceab --- /dev/null +++ b/subprojects/SQLiteCpp/meson.build @@ -0,0 +1,26 @@ +project('SQLiteCpp', 'cpp', + version: '3.0.0', + meson_version: '>=0.49.2', + default_options: ['cpp_std=gnu++11'], +) + +sqlite_dep = dependency('sqlite3', version: '>=3.7.15') + +pub_incdir = include_directories('SQLiteCpp/include') + +sqlitecpp_target = library(meson.project_name(), + 'SQLiteCpp/src/Backup.cpp', + 'SQLiteCpp/src/Column.cpp', + 'SQLiteCpp/src/Database.cpp', + 'SQLiteCpp/src/Exception.cpp', + 'SQLiteCpp/src/Statement.cpp', + 'SQLiteCpp/src/Transaction.cpp', + install: true, + include_directories: [pub_incdir], + dependencies: [sqlite_dep], +) + +sqlitecpp_dep = declare_dependency( + link_with: sqlitecpp_target, + include_directories: pub_incdir, +)