cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-04 09:46:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from SRombauts/master

Browse Source 
Update SQLiteCPP
This commit is contained in:
worktycho 2015-05-28 12:56:05 +01:00
commit 49679e7b54
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -42,6 +42,7 @@ else (MSVC)
set(CPPCHECK_ARG_TEMPLATE "--template=gcc")
if (CMAKE_COMPILER_IS_GNUCXX)
# GCC flags
#add_compile_options() is not supported with CMake 2.8.7 of Ubuntu 12.04 on Travis-CI
add_definitions(-rdynamic -fstack-protector-all -Wall -Wextra -pedantic -Wformat-security -Winit-self -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow -Wcast-qual -Wconversion -Wlogical-op -Winline)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# Clang flags
@ -211,11 +212,12 @@ endif (SQLITECPP_BUILD_EXAMPLES)
option(SQLITECPP_BUILD_TESTS "Build and run tests." OFF)
if (SQLITECPP_BUILD_TESTS)
# add the subdirectory containing the CMakeLists.txt for the gtest library
# deactivate some warnings for compiling the gtest library
if (NOT MSVC)
add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-conversion -Wno-switch-enum)
add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-switch-enum -Wno-float-equal -Wno-conversion-null -Wno-switch-default -Wno-pedantic)
endif (NOT MSVC)
# add the subdirectory containing the CMakeLists.txt for the gtest library
add_subdirectory(googletest)
include_directories("${PROJECT_SOURCE_DIR}/googletest/include")

4
README.md
View File

@ -104,6 +104,10 @@ ln -s ../examples examples
ctest . # make test
```
#### CMake options
* For more options on customizing the build, see the [CMakeLists.txt](https://github.com/SRombauts/SQLiteCpp/blob/master/CMakeLists.txt) file.
#### Troubleshooting
Under Linux, if you get muliple linker errors like "undefined reference to sqlite3_xxx",

9
cpplint.py vendored
View File

@ -992,7 +992,12 @@ def Error(filename, linenum, category, confidence, message):
if _ShouldPrintError(category, confidence, linenum):
_cpplint_state.IncrementErrorCount(category)
if _cpplint_state.output_format == 'vs7':
sys.stderr.write('%s(%s): %s [%s] [%d]\n' % (
# SRombauts:
if confidence == 5:
sys.stderr.write('%s(%s): error: %s [%s] [%d]\n' % (
filename, linenum, message, category, confidence))
else: # confidence == [0-4]
sys.stderr.write('%s(%s): warning: %s [%s] [%d]\n' % (
filename, linenum, message, category, confidence))
elif _cpplint_state.output_format == 'eclipse':
# SRombauts:
@ -1002,7 +1007,7 @@ def Error(filename, linenum, category, confidence, message):
elif confidence == 4:
sys.stderr.write('%s:%s: warning: %s [%s] [%d]\n' % (
filename, linenum, message, category, confidence))
else:
else: # confidence == [0-3]
sys.stderr.write('%s:%s: note: %s [%s] [%d]\n' % (
filename, linenum, message, category, confidence))
else:

2
googletest

@ -1 +1 @@
Subproject commit 4650552ff637bb44ecf7784060091cbed3252211
Subproject commit 23574bf2333f834ff665f894c97bef8a5b33a0a9

2
include/SQLiteCpp/Exception.h
View File

@ -45,7 +45,7 @@ public:
#endif
// Detect whether the compiler supports C++11 noexcept exception specifications.
#if (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7 ) && defined(__GXX_EXPERIMENTAL_CXX0X__))
#if (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
// GCC 4.7 and following have noexcept
#elif defined(__clang__) && __has_feature(cxx_noexcept)
// Clang 3.0 and above have noexcept