177 Commits

Author SHA1 Message Date
Filip Milosevic
2ce092bfd1
Merge branch 'master' into temp-brnach 2025-08-04 17:06:37 +02:00
Simon Gene Gottlieb
47909c4afb fix: hide installation behind an option
Currently, every project pulling in SQLiteCpp automatically gets an
`make install` which installs SQLiteCpp into the system.
This is often not desired, since other projects only statically link.
The solution is to add another "SQLITECPP_install" option, which allows
to turn on/off this behavior.
2025-05-23 20:35:40 +02:00
Sébastien Rombauts
28e8fbf92d Update project version to 3.3.3 2025-05-20 22:07:28 +02:00
Sébastien Rombauts
a865d1c61a Update copyright notice to 2025 2025-05-19 21:20:36 +02:00
Sébastien Rombauts
52b24b9a37
Add logic to use different FindPackage for python if cmake is above 3.12 (#454)
find_package(PythonInterp) has been deprecated since cmake 3.5 and is
throwing a warning as of 3.27 (maybe earlier). Since the minimum
required version is 3.5 for this repo, added a branch to use the
appropriate find_package depending on the version.

Tested with 3.27 (above the split) and 3.10.x (below the split). Both
were successful for me (ubuntu:18.04 & 22.04).
2024-08-20 21:37:12 +02:00
Sébastien Rombauts
2644c311dd Test linking with builtin sqlite3 library on Ubuntu and macOS
Using -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_OMIT_LOAD_EXTENSION=ON
2024-08-18 22:31:12 +02:00
Sébastien Rombauts
553361b5c0 CMake: print the version of the system library if linking with it 2024-08-17 23:31:14 +02:00
Sébastien Rombauts
b1e5131d3c Add dependabot and meson files to the Visual Studio filters 2024-08-16 22:10:04 +02:00
Sébastien Rombauts
31463a94b8 Update project version to 3.3.2 2024-08-16 20:50:35 +02:00
Sébastien Rombauts
1909a777d5 Update copyright notice to 2024 2024-08-16 20:46:14 +02:00
John Torcivia
fab3ab2684 Add logic to use different FindPackage for python if cmake is above 3.12 2023-10-21 08:48:13 -04:00
Sébastien Rombauts
81b2fc9262 Update project version to 3.3.1 2023-08-27 22:58:57 +02:00
Sébastien Rombauts
5164de641d Rename the original build.yml to cmake.yml vs meson.yml
Rename all workflows with explicit names
2023-08-27 22:48:25 +02:00
Sébastien Rombauts
3bdd13ae95 set CMAKE_RUNTIME_OUTPUT_DIRECTORY so that executables and dlls share the bin/ directory 2023-08-18 23:07:47 +02:00
Sébastien Rombauts
6bc108b452
Declare BUILD_SHARED_LIBS option for discoverability (#440)
BUILD_SHARED_LIBS is a standard CMake variable, but we declare it
explicitly to make it prominent
2023-08-18 22:34:26 +02:00
Sébastien Rombauts
3871ff0962 Don't build the googlemock subproject, only the main googletest library 2023-08-18 22:33:18 +02:00
Sébastien Rombauts
e6f2c000e6 Declare BUILD_SHARED_LIBS option for discoverability
BUILD_SHARED_LIBS is a standard CMake variable, but we declare it explicitly to make it prominent
2023-08-18 16:02:30 +02:00
Sébastien Rombauts
2a43ce0cd5 Don't set SQLITECPP_USE_STATIC_RUNTIME by default when building with unit tests
Use gtest_force_shared_crt to force googletest to link against the default dynamic C++ runtime
2023-08-18 15:49:30 +02:00
Sébastien Rombauts
741078b379 Replace the set() of "/MT" to REPLACE "/MD" "/MT"
inspired from Zlib licensed glfw https://github.com/glfw/glfw/blob/master/CMakeLists.txt
2023-08-18 15:49:30 +02:00
Sébastien Rombauts
9976cdf744 Update cmake_minimum_required() to VERSION 3.5
Fix CMake 3.27 deprecation warning:

  Compatibility with CMake < 3.5 will be removed from a future version of
  CMake.

  Update the VERSION argument <min> value or use a ...<max> suffix to tell
  CMake that the project does not need compatibility with older versions.
2023-08-18 15:47:04 +02:00
Calum Robinson
24a24b3be9 Define SQLITECPP_COMPILE_DLL as PUBLIC
* So that users of the SQLiteCpp lib have it defined automatically
* Fixed #432
2023-07-14 14:17:12 +01:00
Sébastien Rombauts
8a3df039e5 Add CMake option SQLITE_ENABLE_DBSTAT_VTAB to enable DBSTAT read-only eponymous virtual table extension when building internal sqlite3 library.
See more here: https://www.sqlite.org/dbstat.html

Fix #426 Support building SQLite with with SQLITE_ENABLE_DBSTAT_VTAB compile option

Disabled by default
2023-05-31 13:50:10 +02:00
Sébastien Rombauts
4a85c81833 Remove option SQLITE_ENABLE_JSON1
since the JSON functions and operators are built into SQLite by default, as of SQLite version 3.38.0 (2022-02-22).

see issue #425 SQLITE_ENABLE_JSON1 flag does not appear to compile sqlite3 with this option
2023-05-31 13:45:24 +02:00
Sébastien Rombauts
2d8f4b9c18 Add CMake option SQLITE_ENABLE_RTREE to enable RTree extension when building internal sqlite3 library
See more here: https://sqlite.org/rtree.html

Disabled by default
2023-05-31 13:42:18 +02:00
Sébastien Rombauts
df11c667fd Update project version to 3.3.0 2023-05-24 18:49:55 +02:00
Sébastien Rombauts
7dbcf482f2 Update copyright notice to 2023 2023-05-24 18:49:55 +02:00
Tim
be4c151c96
Remove mismatched else condition in CMakeLists.txt
From the CMake docs:

> Per legacy, the else() and endif() commands admit an optional <condition> argument. If used, it must be a verbatim repeat of the argument of the opening if command.
2023-04-11 14:36:48 +01:00
Pierre Proske
8f8eee6168 Simplify CMake for shared libs 2023-02-07 12:45:31 +11:00
Pierre Proske
14cba69a33 Now working with example 2023-02-06 19:43:35 +11:00
Pierre Proske
e3fc62dd35 More fixes, should be working now 2023-02-06 13:19:57 +11:00
Pierre Proske
25ab3ce1c2 Add dll export/import macros 2023-02-03 18:27:21 +11:00
Sébastien Rombauts
bac9a8a6ad
Merge pull request #399 add disable option for sqlite3_expanded_sql from ninjaoflight/optional-sqlite3_expanded_sql 2023-02-02 07:46:57 +01:00
Jonathan Guzmán
c07f9ba8f0
add_definitions changed to target_compile_definitions 2022-12-19 20:05:37 -06:00
Jonathan Guzmán
c95a32378e
change add_definitions to target_compile_definitions 2022-12-19 20:00:16 -06:00
Jonathan Guzmán
1841e6b66f
add disable option for sqlite3_expanded_sql
make sqlite3_expanded_sql use optional and give a warning at compile time
along with a exception at runtime when used in an application
2022-12-19 19:18:31 -06:00
Sébastien Rombauts
bd5bf7996a Release 3.2.1
Bugfixes and cmake/meson build system fixes only
2022-12-12 18:14:25 +01:00
Sébastien Rombauts
8e00fef2e5
Merge pull request #388 make std::filesystem optional from ninjaoflight/std-filesystem-optional 2022-12-11 22:46:39 +01:00
Jonathan Guzmán
8d36ab8304
make std::filesystem optional
Add a switch to disable std::filesystem so it can be optinally disabled
this should let users that older compilers versions to disable it
2022-12-11 14:39:49 -06:00
Sébastien Rombauts
46ef117e1f Fix #382 #74 disable SQLITECPP_USE_STACK_PROTECTION when running on MinGW 2022-12-11 17:57:53 +01:00
Sébastien Rombauts
c68f651a10
Merge pull request #277 from cuberite/cmake-scoping
Fix cmake scoping issues with packaged SQLite
2022-09-30 20:11:34 +02:00
Sébastien Rombauts
30f66469ee Fix line ending issues; back to Linux 2022-09-30 20:10:58 +02:00
Sébastien Rombauts
42f7013983 Disable SQLITECPP_USE_STATIC_RUNTIME by default
The option SQLITECPP_USE_STATIC_RUNTIME is now only defined for MSVC
and its default value is now dependent of SQLITECPP_BUILD_TESTS
2022-09-29 15:08:52 +02:00
Sébastien Rombauts
b85df14905 Release 3.2.0 2022-09-18 15:28:42 +02:00
AR Dabbour
6e1242fab9
Install the package.xml file 2021-10-14 15:58:04 +03:00
Sébastien Rombauts
beb2b29640 Update copyright to 2021 2021-10-06 18:40:51 +02:00
Paulo Coutinho
925923c507 fix load extension 2021-10-01 19:27:16 -03:00
David Feurle
359aae4cbe We only need to link the cipher version of sqlite in case of HAS_CODEC 2021-07-25 12:13:40 +02:00
Tiger Wang
b1f67393fd It's the sqlite3 library that needs threads 2021-06-24 20:52:28 +01:00
Sébastien Rombauts
cac0000ada Merge #299 Added Savepoint support from catalogm 2021-01-06 11:07:44 +01:00
past-due
113d43f561 [CMake] Add SQLITECPP_INCLUDE_SCRIPT option 2020-12-11 18:41:43 -05:00