diff --git a/CHANGELOG.md b/CHANGELOG.md index ac74d3b8..8de2ffe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -215,3 +215,16 @@ Version 3.2.0 - 2022 Septembre 18 - #364 Removal of remaining long APIs from SRombauts/convert-remaining-long-types - #366 Add vcpkg installation instructions from FrankXie05/vcpkg-instructions - #360 Small improvements and code cleaning from Kacperos155/small_improvements + +Versions 3.2.1 - 2022 Decembre 12 +- Merge pull request #383 Update SQLite from 3.39.3 to 3.40.0 (2022-11-16) from SRombauts/update-sqlite-340 +- Merge pull request #370 Don't link anymore with Visual Studio's static runtime by default from SRombauts/dont-enforce-static-linking +- Merge pull request #371 from SRombauts/appveyor-vs-2022 +- Merge pull request #277 from cuberite/cmake-scoping +- Merge pull request #374 Update googletest from vuhailongkl97/master +- Merge pull request #377 Some documentation fixes from cbielow/fix_doc +- Merge pull request #380 [Meson] fixes for meson project from ninjaoflight/windows-support +- Merge pull request #387 Ensure that TEXT column is UTF-8 encoded before using sqlite3_column_blob() from dougnazar +- Merge pull request #385 disable SQLITECPP_USE_STACK_PROTECTION when on MinGW from SRombauts/mingw-disable-stack-protection +- Merge pull request #386 [meson] Update SQLite from 3.39.3 to 3.40.0 from ninjaoflight/sqlite-meson-update +- Merge pull request #389 [meson] add missing compile options from ninjaoflight/meson-fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e07c342..4c020dae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # or copy at http://opensource.org/licenses/MIT) cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp -project(SQLiteCpp VERSION 3.2.0) +project(SQLiteCpp VERSION 3.2.1) # SQLiteC++ 3.x requires C++11 features if (NOT CMAKE_CXX_STANDARD) diff --git a/Doxyfile b/Doxyfile index 03365d83..4bcd1286 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = SQLiteC++ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.2.0 +PROJECT_NUMBER = 3.2.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/include/SQLiteCpp/SQLiteCpp.h b/include/SQLiteCpp/SQLiteCpp.h index 4afde64f..c8d1801b 100644 --- a/include/SQLiteCpp/SQLiteCpp.h +++ b/include/SQLiteCpp/SQLiteCpp.h @@ -40,5 +40,5 @@ * * WARNING: shall always be updated in sync with PROJECT_VERSION in CMakeLists.txt */ -#define SQLITECPP_VERSION "3.02.00" // 3.2.0 -#define SQLITECPP_VERSION_NUMBER 3002000 // 3.2.0 +#define SQLITECPP_VERSION "3.02.01" // 3.2.1 +#define SQLITECPP_VERSION_NUMBER 3002001 // 3.2.1