King_DuckZ/orotool
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

Fix SQLiteCpp meson scripts.

Browse source
This commit is contained in:
King_DuckZ 2020-08-28 00:13:13 +01:00
parent ada38348ee
commit 6b41e08403
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ compile_commands.json
links.txt links.txt
*.bin *.bin
subprojects/curlcpp/ subprojects/curlcpp/
subprojects/SQLiteCpp/

30
subprojects/packagefiles/SQLiteCpp/meson.build
View file

@ -6,7 +6,7 @@ project('SQLiteCpp', 'cpp',
sqlite_dep = dependency('sqlite3', version: '>=3.32.1') sqlite_dep = dependency('sqlite3', version: '>=3.32.1')
pub_incdir = include_directories('SQLiteCpp/include') pub_incdir = include_directories('include')
compiler_opts = [] compiler_opts = []
if get_option('sqlite_enable_column_metadata') if get_option('sqlite_enable_column_metadata')
@ -23,12 +23,12 @@ if get_option('sqlite_use_legacy_struct')
endif endif
sqlitecpp_target = library(meson.project_name(), sqlitecpp_target = library(meson.project_name(),
'SQLiteCpp/src/Backup.cpp', 'src/Backup.cpp',
'SQLiteCpp/src/Column.cpp', 'src/Column.cpp',
'SQLiteCpp/src/Database.cpp', 'src/Database.cpp',
'SQLiteCpp/src/Exception.cpp', 'src/Exception.cpp',
'SQLiteCpp/src/Statement.cpp', 'src/Statement.cpp',
'SQLiteCpp/src/Transaction.cpp', 'src/Transaction.cpp',
install: true, install: true,
include_directories: [pub_incdir], include_directories: [pub_incdir],
dependencies: [sqlite_dep], dependencies: [sqlite_dep],
@ -40,4 +40,20 @@ sqlitecpp_dep = declare_dependency(
link_with: sqlitecpp_target, link_with: sqlitecpp_target,
include_directories: pub_incdir, include_directories: pub_incdir,
compile_args: compiler_opts, compile_args: compiler_opts,
dependencies: sqlite_dep.partial_dependency(includes: true),
)
install_headers(
'include/SQLiteCpp/Assertion.h',
'include/SQLiteCpp/Backup.h',
'include/SQLiteCpp/Column.h',
'include/SQLiteCpp/Database.h',
'include/SQLiteCpp/Exception.h',
'include/SQLiteCpp/ExecuteMany.h',
'include/SQLiteCpp/SQLiteCpp.h',
'include/SQLiteCpp/Statement.h',
'include/SQLiteCpp/Transaction.h',
'include/SQLiteCpp/Utils.h',
'include/SQLiteCpp/VariadicBind.h',
subdir: meson.project_name(),
) )