diff --git a/.gitignore b/.gitignore index a244c3c..6734751 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ compile_commands.json links.txt *.bin subprojects/curlcpp/ +subprojects/SQLiteCpp/ diff --git a/subprojects/packagefiles/SQLiteCpp/meson.build b/subprojects/packagefiles/SQLiteCpp/meson.build index 8da3373..08aa8e4 100644 --- a/subprojects/packagefiles/SQLiteCpp/meson.build +++ b/subprojects/packagefiles/SQLiteCpp/meson.build @@ -6,7 +6,7 @@ project('SQLiteCpp', 'cpp', sqlite_dep = dependency('sqlite3', version: '>=3.32.1') -pub_incdir = include_directories('SQLiteCpp/include') +pub_incdir = include_directories('include') compiler_opts = [] if get_option('sqlite_enable_column_metadata') @@ -23,12 +23,12 @@ if get_option('sqlite_use_legacy_struct') endif 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', + 'src/Backup.cpp', + 'src/Column.cpp', + 'src/Database.cpp', + 'src/Exception.cpp', + 'src/Statement.cpp', + 'src/Transaction.cpp', install: true, include_directories: [pub_incdir], dependencies: [sqlite_dep], @@ -40,4 +40,20 @@ sqlitecpp_dep = declare_dependency( link_with: sqlitecpp_target, include_directories: pub_incdir, 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(), )