3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/rbock/sqlpp11 into develop

Browse Source
This commit is contained in:
rbock 2015-06-01 22:13:56 +02:00
commit 61077f471c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,6 +33,7 @@ target_include_directories(sqlpp11 INTERFACE
$<BUILD_INTERFACE:${sqlpp11_SOURCE_DIR}/include> $<BUILD_INTERFACE:${sqlpp11_SOURCE_DIR}/include>
) )
if (NOT MSVC)
target_compile_features(sqlpp11 INTERFACE target_compile_features(sqlpp11 INTERFACE
cxx_alias_templates cxx_alias_templates
cxx_auto_type cxx_auto_type
@ -54,6 +55,7 @@ target_compile_features(sqlpp11 INTERFACE
cxx_template_template_parameters cxx_template_template_parameters
cxx_variadic_templates cxx_variadic_templates
) )
endif ()
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(test_constraints) add_subdirectory(test_constraints)

8
README.md
View File

@ -1,14 +1,16 @@
sqlpp11 sqlpp11
======= =======
[![Build Status](https://travis-ci.org/purpleKarrot/sqlpp11.svg?branch=develop)](https://travis-ci.org/purpleKarrot/sqlpp11) [![Build Status](https://travis-ci.org/rbock/sqlpp11.svg?branch=develop)](https://travis-ci.org/rbock/sqlpp11?branch=develop)
[![Coverage Status](https://coveralls.io/repos/purpleKarrot/sqlpp11/badge.svg?branch=develop)](https://coveralls.io/r/purpleKarrot/sqlpp11?branch=develop) [![Coverage Status](https://coveralls.io/repos/rbock/sqlpp11/badge.svg?branch=develop)](https://coveralls.io/r/rbock/sqlpp11?branch=develop)
A type safe embedded domain specific language for SQL queries and results in C++ A type safe embedded domain specific language for SQL queries and results in C++
Extensive documentation is found in the wiki, https://github.com/rbock/sqlpp11/wiki Extensive documentation is found in the wiki, https://github.com/rbock/sqlpp11/wiki
Upcoming talks/workshops) at Past talks/workshops at
* CppCast: http://cppcast.com
* 2015-05-07: http://cppcast.com/2015/05/roland-bock/
* CppCon (Bellevue, Washington, USA): http://cppcon.org * CppCon (Bellevue, Washington, USA): http://cppcon.org
* 2014-09-08: http://sched.co/1qhngYK (Workshop Part 1) * 2014-09-08: http://sched.co/1qhngYK (Workshop Part 1)
* 2014-09-11: http://sched.co/1r4lue3 (Talk) * 2014-09-11: http://sched.co/1r4lue3 (Talk)

3
tests/CMakeLists.txt
View File

@ -24,7 +24,10 @@
add_library(sqlpp11_testing INTERFACE) add_library(sqlpp11_testing INTERFACE)
target_include_directories(sqlpp11_testing INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(sqlpp11_testing INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
if (NOT MSVC)
target_compile_options(sqlpp11_testing INTERFACE -Wall -Wextra -pedantic) target_compile_options(sqlpp11_testing INTERFACE -Wall -Wextra -pedantic)
endif ()
set(test_names set(test_names
BooleanExpression BooleanExpression