Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson project changes based on wrap submission review #391

Merged
merged 2 commits into from
Dec 15, 2022
Merged

meson project changes based on wrap submission review #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8b812e
meson code review
UnixY2K Dec 14, 2022
f71633c
set warning level to 3
UnixY2K Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 47 additions & 32 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project(
'SQLiteCpp', 'cpp',
# SQLiteCpp requires C++11 support
default_options: ['cpp_std=c++11'],
default_options: ['cpp_std=c++11', 'warning_level=3'],
license: 'MIT',
version: '3.2.0',
version: '3.2.1',
)

cxx = meson.get_compiler('cpp')
Expand Down Expand Up @@ -39,18 +39,25 @@ sqlite3_dep = dependency(
sqlitecpp_incl = [
include_directories('include')
]
sqlitecpp_srcs = [
sqlitecpp_srcs = files(
'src/Backup.cpp',
'src/Column.cpp',
'src/Database.cpp',
'src/Exception.cpp',
'src/Savepoint.cpp',
'src/Statement.cpp',
'src/Transaction.cpp',
]
sqlitecpp_args = [
'-Wall',
]
)
sqlitecpp_args = cxx.get_supported_arguments(
# included in meson by default
# -Wall
# included when warning_level=3
#'-Wextra',
#'-Wpedantic',
'-Wswitch-enum',
'-Wshadow',
'-Wno-long-long',
)
sqlitecpp_link = []
sqlitecpp_deps = [
sqlite3_dep,
Expand All @@ -61,7 +68,7 @@ sqlitecpp_opts = []

## tests

sqlitecpp_test_srcs = [
sqlitecpp_test_srcs = files(
'tests/Column_test.cpp',
'tests/Database_test.cpp',
'tests/Savepoint_test.cpp',
Expand All @@ -71,30 +78,18 @@ sqlitecpp_test_srcs = [
'tests/VariadicBind_test.cpp',
'tests/Exception_test.cpp',
'tests/ExecuteMany_test.cpp',
]
)
sqlitecpp_test_args = []

## samples

sqlitecpp_sample1_srcs = [
sqlitecpp_sample1_srcs = files(
'examples/example1/main.cpp',
]
sqlitecpp_sample2_srcs = [
)
sqlitecpp_sample2_srcs = files(
'examples/example2/src/main.cpp',
]
)

# if not using MSVC we need to add this compiler arguments
# for a list of MSVC supported arguments please check:
# https://docs.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-alphabetically?view=msvc-170
if not (host_machine.system() == 'windows' and cxx.get_id() == 'msvc')
sqlitecpp_args += [
'-Wextra',
'-Wpedantic',
'-Wswitch-enum',
'-Wshadow',
'-Wno-long-long',
]
endif
## using MSVC headers requires c++14, if not will show an error on xstddef as:
## 'auto' return without trailing return type; deduced return types are a C++14 extension
if host_machine.system() == 'windows'
Expand All @@ -104,7 +99,7 @@ if host_machine.system() == 'windows'
]
# check that we are not trying to build as dynamic library
if get_option('default_library') != 'shared'
warming('SQLiteCpp does not support shared library on Windows, the library will be built as static')
message('warning: SQLiteCpp does not support shared library on Windows, the library will be built as static')
endif

endif
Expand Down Expand Up @@ -140,26 +135,46 @@ if get_option('SQLITECPP_DISABLE_STD_FILESYSTEM')
endif

## stack protection hardening
if get_option('SQLITECPP_USE_STACK_PROTECTOR')
if get_option('SQLITECPP_USE_STACK_PROTECTION')
## if is on MinGW-W64 give a warning that is not supported
if mingw_64_env
warning('SQLiteCpp does not support stack protection on MinGW-W64')
warming('this could lead to a crash on the application')
warming('you can disable this warning by setting SQLITECPP_USE_STACK_PROTECTOR to false')
message('warning: SQLiteCpp does not support stack protection on MinGW-W64')
message('warning: this could lead to a crash on the application')
message('warning: you can disable this warning by setting SQLITECPP_USE_STACK_PROTECTOR to false')
else
sqlitecpp_args += ['-fstack-protector']
endif
endif

## enable ommit load extension
if get_option('SQLITECPP_OMIT_LOAD_EXTENSION')
if get_option('SQLITE_OMIT_LOAD_EXTENSION')
sqlitecpp_args += ['-DSQLITE_OMIT_LOAD_EXTENSION']
## check if running on OSX
elif host_machine.system() == 'darwin' and sqlite3_dep.found()
sqlite3_load_extension_support = cxx.links(
'''
#include <sqlite3.h>
int main() {
sqlite3_enable_load_extension(0, 0);
return 0;
}
''',
name: 'sqlite3_load_extension',
dependencies: [sqlite3_dep])
if not sqlite3_load_extension_support
message('warning: Detected bundled SQLite3 in OSX, but it does not support load extension')
message('warning: SQLiteCpp will be built without load extension support')
message('warning: You can disable this warning by setting SQLITE_OMIT_LOAD_EXTENSION to false')
sqlitecpp_args += ['-DSQLITE_OMIT_LOAD_EXTENSION']
endif
endif



if unix_like
sqlitecpp_args += [
'-DfPIC',
# -fPIC is included by default in meson
# 'fPIC',
]
# add dl dependency
libdl_dep = cxx.find_library('dl')
Expand Down
4 changes: 2 additions & 2 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ option('SQLITE_HAS_CODEC', type: 'boolean', value: false, description: 'Enable d
## Force forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)
option('SQLITE_USE_LEGACY_STRUCT', type: 'boolean', value: false, description: 'Fallback to forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)')
## Enable ommit load extension
option('SQLITE_OMMIT_LOAD_EXTENSION', type: 'boolean', value: false, description: 'Enable ommit load extension.')
option('SQLITE_OMIT_LOAD_EXTENSION', type: 'boolean', value: false, description: 'Enable ommit load extension.')
## Disable the support for std::filesystem (C++17)
option('SQLITECPP_DISABLE_STD_FILESYSTEM', type: 'boolean', value: false, description: 'Disable the support for std::filesystem (C++17)')
## Stack protection is not supported on MinGW-W64 on Windows, allow this flag to be turned off.
option('SQLITECPP_USE_STACK_PROTECTION', type: 'boolean', value: true, description: 'Enable stack protection for MySQL.')
## Enable build for the tests of SQLiteC++
option('SQLITECPP_BUILD_TESTS', type: 'boolean', value: false, description: 'Build SQLiteC++ unit tests.')
## Build the examples of SQLiteC++
option('SQLITECPP_BUILD_EXAMPLES', type: 'boolean', value: false, description: 'Build SQLiteC++ examples.')
option('SQLITECPP_BUILD_EXAMPLES', type: 'boolean', value: false, description: 'Build SQLiteC++ examples.')