From 036a8ff98e890071089e9938cb87c5c4323152f0 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Mon, 28 Jul 2014 19:59:53 +0200 Subject: [PATCH] Added SQLiteCpp library. This provides C++ wrappers for SQLite, making it safer to use in the C++ environment. --- .gitmodules | 3 +++ CMakeLists.txt | 9 +++++++++ Install/SQLiteCpp-LICENSE.txt | 20 ++++++++++++++++++++ Install/Zip2008.list | 1 + lib/SQLiteCpp | 1 + 5 files changed, 34 insertions(+) create mode 100644 Install/SQLiteCpp-LICENSE.txt create mode 160000 lib/SQLiteCpp diff --git a/.gitmodules b/.gitmodules index 2aaee3624..8e63ee0a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "lib/polarssl"] path = lib/polarssl url = https://github.com/mc-server/polarssl +[submodule "lib/SQLiteCpp"] + path = lib/SQLiteCpp + url = https://github.com/mc-server/SQLiteCpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a6400c1b4..478b79047 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,14 @@ endif() project (MCServer) +# Set options for SQLiteCpp, disable all their tests and lints: +set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide." FORCE) +set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis tool." FORCE) +set(SQLITECPP_RUN_DOXYGEN OFF CACHE BOOL "Run Doxygen C++ documentation tool." FORCE) +set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples." FORCE) +set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." FORCE) +set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) + # Include all the libraries: add_subdirectory(lib/inifile/) add_subdirectory(lib/jsoncpp/) @@ -60,6 +68,7 @@ add_subdirectory(lib/zlib/) add_subdirectory(lib/lua/) add_subdirectory(lib/tolua++/) add_subdirectory(lib/sqlite/) +add_subdirectory(lib/SQLiteCpp/) add_subdirectory(lib/expat/) add_subdirectory(lib/luaexpat/) diff --git a/Install/SQLiteCpp-LICENSE.txt b/Install/SQLiteCpp-LICENSE.txt new file mode 100644 index 000000000..ec952abba --- /dev/null +++ b/Install/SQLiteCpp-LICENSE.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2012-2014 Sebastien Rombauts (sebastien.rombauts@gmail.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Install/Zip2008.list b/Install/Zip2008.list index b118ccbf9..5736867d8 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -11,4 +11,5 @@ MCServer*debug.cmd Lua-LICENSE.txt LuaExpat-license.html LuaSQLite3-LICENSE.txt +SQLiteCpp-LICENSE.txt MersenneTwister-LICENSE.txt diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp new file mode 160000 index 000000000..27b9d1118 --- /dev/null +++ b/lib/SQLiteCpp @@ -0,0 +1 @@ +Subproject commit 27b9d111818af3b05bcf4153bb6e380fe1dd6816