diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d5345b3..ec4a8f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,7 +156,7 @@ Version 2.5.0 - December 31 2019 - #251 Added example for getHeaderInfo() -Version 3.0.0 - January 1 2020 +Version 3.0.0 - January 31 2020 - C++11 is now required - CMake 3.1 minimum - Visual Studio 2015 minimum @@ -165,7 +165,14 @@ Version 3.0.0 - January 1 2020 - Add Valgrind memcheck tool to Travis CI - Remove Statement::isOk() deprecated in 2.2.0 when renamed to Statement::hasRow() - Replace Database::backup() "C" implementation by calling the Backup class -- Run Valgrind memcheck on Travis CI #252 -- Keep inline functions for GCov code coverage #253 -- Re-enable Coverity static analysis #254 -- Fix linking with system library (libsqlite3) #256 +- #252 Run Valgrind memcheck on Travis CI +- #253 Keep inline functions for GCov code coverage +- #254 Re-enable Coverity static analysis +- #256 Fix linking with system library (libsqlite3) +- #242 Added a `getIndex` method and used it (KOLANICH) +- #257 Improve Statement unit tests coverage (bind by name with a std::string) +- #234 support for external sqlite3 (BioDataAnalysis/emmenlau) +- #243 adding a pure attribute to getIndex() (KOLANICH) + + + diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b3d3344..9363c0d8 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 2.99) +project(SQLiteCpp VERSION 3.0.0) # SQLiteC++ 3.x requires C++11 features if (NOT CMAKE_CXX_STANDARD) diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt index ea68bfa0..207422ed 100644 --- a/examples/example2/CMakeLists.txt +++ b/examples/example2/CMakeLists.txt @@ -1,25 +1,25 @@ -# Example CMake file for compiling & linking a project with the the SQLiteCpp wrapper -# -# Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com) -# -# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt -# or copy at http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version -project(SQLiteCpp_Example VERSION 2.0) +# Example CMake file for compiling & linking a project with the the SQLiteCpp wrapper +# +# Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com) +# +# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt +# or copy at http://opensource.org/licenses/MIT) +cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version +project(SQLiteCpp_Example VERSION 2.0) # SQLiteC++ 3.x now requires C++11 compiler set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# Add SQLite3 C++ wrapper around sqlite3 library (and sqlite3 itself provided for ease of use) -# Here you can set CMake variables to avoid building Example, as well as cpplint, cppcheck... -# or set them in the cmake command line (see for instance provided build.bat/build.sh scripts) -set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "" FORCE) -set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "" FORCE) -add_subdirectory(../.. SQLiteCpp) # out-of-source build requires explicit subdir name for compilation artifacts - -# Add main.cpp example source code to the executable -add_executable(SQLiteCpp_Example src/main.cpp) - -# Link SQLiteCpp_example1 with SQLiteCpp -target_link_libraries(SQLiteCpp_Example SQLiteCpp) + +# Add SQLite3 C++ wrapper around sqlite3 library (and sqlite3 itself provided for ease of use) +# Here you can set CMake variables to avoid building Example, as well as cpplint, cppcheck... +# or set them in the cmake command line (see for instance provided build.bat/build.sh scripts) +set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "" FORCE) +set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "" FORCE) +add_subdirectory(../.. SQLiteCpp) # out-of-source build requires explicit subdir name for compilation artifacts + +# Add main.cpp example source code to the executable +add_executable(SQLiteCpp_Example src/main.cpp) + +# Link SQLiteCpp_example1 with SQLiteCpp +target_link_libraries(SQLiteCpp_Example SQLiteCpp)