diff --git a/README.md b/README.md index fff621d..14e3d9e 100644 --- a/README.md +++ b/README.md @@ -76,11 +76,8 @@ Under Debian/Ubuntu/Mint Linux, install the libsqlite3-dev package. ### Building the examples: -A basic Makefile is provided, tested under Linux/Ubuntu 12.10, requiring the sqlite3 static library (sqlite3-dev Debian/Ubuntu package) -Solutions for Visual Studio 2008 and 2010 are provided in the "msvc/" directory, directly using the sqlite3.c source code for ease of use. - #### CMake and test -A CMake configuration file is also provided for better multiplatform support and testing. +A CMake configuration file is also provided for multiplatform support and testing. Typical generic build (see also "build.bat" or "./build.sh"): diff --git a/build.bat b/build.bat index 28637b4..67166af 100644 --- a/build.bat +++ b/build.bat @@ -1,12 +1,12 @@ -@REM Copyright (c) 2013 Sébastien Rombauts (sebastien.rombauts@gmail.com) +@REM Copyright (c) 2013-2014 Sébastien Rombauts (sebastien.rombauts@gmail.com) @REM @REM Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt @REM or copy at http://opensource.org/licenses/MIT) mkdir build cd build -@REM generate solution for Visual Studio 2010, and build it -cmake -DSQLITECPP_RUN_CPPLINT=ON -DSQLITECPP_RUN_CPPCHECK=ON -DSQLITECPP_RUN_DOXYGEN=ON -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON .. -G "Visual Studio 10" +@REM generate solution for Visual Studio, and build it +cmake -DSQLITECPP_RUN_CPPLINT=ON -DSQLITECPP_RUN_CPPCHECK=ON -DSQLITECPP_RUN_DOXYGEN=ON -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON .. cmake --build . @REM prepare and launch tests diff --git a/googletest b/googletest index be1b3b6..4650552 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit be1b3b66822cc3929f3da700973cef88bf45849a +Subproject commit 4650552ff637bb44ecf7784060091cbed3252211 diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h index f875366..f9e457a 100644 --- a/include/SQLiteCpp/Statement.h +++ b/include/SQLiteCpp/Statement.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief A prepared SQLite Statement is a compiled SQL query ready to be executed, pointing to a row of result. * - * Copyright (c) 2012-2013 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2014 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) @@ -269,7 +269,7 @@ public: //////////////////////////////////////////////////////////////////////////// /** - * @brief Return a copie of the column data specified by its index + * @brief Return a copy of the column data specified by its index * * Can be used to access the data of the current row of result when applicable, * while the executeStep() method returns true.