Skip to content

Commit 115c6f6

Browse files
fnc12fnc12
authored
Merge pull request #818 from fnc12/dev
v1.7
2 parents 1ee0a86 + 75c5c62 commit 115c6f6

File tree

217 files changed

+24581
-9673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+24581
-9673
lines changed

‎.clang-format‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
5454
ConstructorInitializerIndentWidth: 4
5555
ContinuationIndentWidth: 4
5656
Cpp11BracedListStyle: true
57-
DerivePointerAlignment: false
57+
DerivePointerAlignment: true
5858
DisableFormat: false
5959
ExperimentalAutoDetectBinPacking: false
6060
FixNamespaceComments: false
@@ -94,7 +94,6 @@ PenaltyBreakString: 1000
9494
PenaltyBreakTemplateDeclaration: 10
9595
PenaltyExcessCharacter: 1000000
9696
PenaltyReturnTypeOnItsOwnLine: 60
97-
PointerAlignment: Right
9897
ReflowComments: false
9998
SortIncludes: false
10099
SortUsingDeclarations: true

‎.github/workflows/clang-format-lint.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v1
1111
- name: clang-format lint
12-
uses: DoozyX/clang-format-lint-action@v0.3.1
12+
uses: DoozyX/clang-format-lint-action@v0.12
13+
with:
14+
clangFormatVersion: 12

‎.travis.yml‎

Lines changed: 75 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Defaults
22
os: linux
3-
dist: bionic
3+
dist: focal
44

55
matrix:
66
include:
@@ -38,52 +38,49 @@ matrix:
3838
env:
3939
- SQLITE_ORM_OMITS_CODECVT: ON
4040

41-
# - name: "[C++14] AppleClang-10.0.1"
42-
# os: osx
43-
# osx_image: xcode10.2
44-
# language: cpp
45-
# env:
46-
# - SQLITE_ORM_OMITS_CODECVT: ON
47-
# addons:
48-
# homebrew:
49-
# packages:
50-
# - catch2
51-
# - ninja
52-
# update: true
41+
- name: "[C++14] AppleClang-10.0.1"
42+
os: osx
43+
osx_image: xcode10.2
44+
language: cpp
45+
env:
46+
- SQLITE_ORM_OMITS_CODECVT: ON
47+
addons:
48+
homebrew:
49+
packages:
50+
- ninja
51+
update: true
5352

54-
# - name: "[C++14] LLVM/Clang (latest)"
55-
# os: osx
56-
# osx_image: xcode10.2
57-
# addons:
58-
# homebrew:
59-
# packages:
60-
# - llvm
61-
# - catch2
62-
# - ninja
63-
# update: true
64-
# env:
65-
# - CPPFLAGS: "-I/usr/local/opt/llvm/include"
66-
# - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
67-
# - CPATH: /usr/local/opt/llvm/include
68-
# - LIBRARY_PATH: /usr/local/opt/llvm/lib
69-
# - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
70-
# - CC: /usr/local/opt/llvm/bin/clang
71-
# - CXX: /usr/local/opt/llvm/bin/clang++
72-
# - SQLITE_ORM_OMITS_CODECVT: ON
53+
- name: "[C++14] LLVM/Clang (latest)"
54+
os: osx
55+
osx_image: xcode10.2
56+
addons:
57+
homebrew:
58+
packages:
59+
- llvm
60+
- ninja
61+
update: true
62+
env:
63+
- CPPFLAGS: "-I/usr/local/opt/llvm/include"
64+
- LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
65+
- CPATH: /usr/local/opt/llvm/include
66+
- LIBRARY_PATH: /usr/local/opt/llvm/lib
67+
- LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
68+
- CC: /usr/local/opt/llvm/bin/clang
69+
- CXX: /usr/local/opt/llvm/bin/clang++
70+
- SQLITE_ORM_OMITS_CODECVT: ON
7371

74-
# - name: "[C++14] GCC-6"
75-
# os: osx
76-
# osx_image: xcode10.2
77-
# addons:
78-
# homebrew:
79-
# packages:
80-
# - gcc@6
81-
# - catch2
82-
# - ninja
83-
# update: true
84-
# env:
85-
# - CC: gcc-6
86-
# - CXX: g++-6
72+
- name: "[C++14] GCC-6"
73+
os: osx
74+
osx_image: xcode10.2
75+
addons:
76+
homebrew:
77+
packages:
78+
- gcc@6
79+
- ninja
80+
update: true
81+
env:
82+
- CC: gcc-6
83+
- CXX: g++-6
8784

8885
- name: "[C++17] GCC-9"
8986
addons:
@@ -111,52 +108,41 @@ matrix:
111108
- CXX: g++-7
112109
- SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
113110

114-
# - name: "[C++17] AppleClang-10.0.1"
115-
# os: osx
116-
# osx_image: xcode10.2
117-
# language: cpp
118-
# env:
119-
# - SQLITE_ORM_OMITS_CODECVT: ON
120-
# - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
121-
# addons:
122-
# homebrew:
123-
# packages:
124-
# - catch2
125-
# - ninja
126-
# update: true
111+
- name: "[C++17] AppleClang-10.0.1"
112+
os: osx
113+
osx_image: xcode10.2
114+
language: cpp
115+
env:
116+
- SQLITE_ORM_OMITS_CODECVT: ON
117+
- SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
118+
addons:
119+
homebrew:
120+
packages:
121+
- ninja
122+
update: true
127123

128-
# - name: "[C++17] LLVM/Clang (latest)"
129-
# os: osx
130-
# osx_image: xcode10.2
131-
# addons:
132-
# homebrew:
133-
# packages:
134-
# - llvm
135-
# - catch2
136-
# - ninja
137-
# update: true
138-
# env:
139-
# - CPPFLAGS: "-I/usr/local/opt/llvm/include"
140-
# - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
141-
# - CPATH: /usr/local/opt/llvm/include
142-
# - LIBRARY_PATH: /usr/local/opt/llvm/lib
143-
# - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
144-
# - CC: /usr/local/opt/llvm/bin/clang
145-
# - CXX: /usr/local/opt/llvm/bin/clang++
146-
# - SQLITE_ORM_OMITS_CODECVT: ON
147-
# - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
124+
- name: "[C++17] LLVM/Clang (latest)"
125+
os: osx
126+
osx_image: xcode10.2
127+
addons:
128+
homebrew:
129+
packages:
130+
- llvm
131+
- ninja
132+
update: true
133+
env:
134+
- CPPFLAGS: "-I/usr/local/opt/llvm/include"
135+
- LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
136+
- CPATH: /usr/local/opt/llvm/include
137+
- LIBRARY_PATH: /usr/local/opt/llvm/lib
138+
- LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
139+
- CC: /usr/local/opt/llvm/bin/clang
140+
- CXX: /usr/local/opt/llvm/bin/clang++
141+
- SQLITE_ORM_OMITS_CODECVT: ON
142+
- SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
148143

149144
before_install:
150-
- |
151-
if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
152-
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" # Use coreutils from homebrew.
153-
fi
154-
# Add ppa repo for cmake and delete cmake 3.12.4 folder of travis
155-
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
156-
- sudo apt-add-repository -y 'deb https://apt.kitware.com/ubuntu/ bionic main'
157-
- sudo apt-get update -qq -y
158-
- sudo apt-get install -y cmake
159-
- sudo rm -r /usr/local/cmake-3.12.4/
145+
- if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"; fi
160146

161147
# scripts to run before build
162148
before_script:
@@ -168,4 +154,4 @@ before_script:
168154
# build examples, and run tests (ie make & make test)
169155
script:
170156
- cmake --build . --config Debug -- -k 10
171-
- ctest --verbose --output-on-failure -C Debug -j $(nproc)
157+
- ctest --verbose --output-on-failure -C Debug -j $(nproc)

‎CMakeLists.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
cmake_minimum_required (VERSION 3.16.0)
1+
cmake_minimum_required (VERSION 3.14.0)
2+
3+
# PACKAGE_VERSION is used by cpack scripts currently
4+
# Both sqlite_orm_VERSION and PACKAGE_VERSION should be the same for now
5+
6+
set(sqlite_orm_VERSION "1.6.0")
7+
set(PACKAGE_VERSION ${sqlite_orm_VERSION})
8+
9+
project("sqlite_orm" VERSION ${PACKAGE_VERSION})
210

311
# Handling C++ standard version to use
412
option(SQLITE_ORM_ENABLE_CXX_17 "Enable C++ 17" OFF)
@@ -14,15 +22,6 @@ endif()
1422
set(CMAKE_CXX_EXTENSIONS OFF)
1523

1624

17-
# PACKAGE_VERSION is used by cpack scripts currently
18-
# Both sqlite_orm_VERSION and PACKAGE_VERSION should be the same for now
19-
20-
set(sqlite_orm_VERSION "1.3.0")
21-
set(PACKAGE_VERSION ${sqlite_orm_VERSION})
22-
23-
project("sqlite_orm" VERSION ${PACKAGE_VERSION})
24-
25-
2625
set(CMAKE_VERBOSE_MAKEFILE ON)
2726

2827
message(STATUS "Configuring ${CMAKE_PROJECT_NAME} ${sqlite_orm_VERSION}")
@@ -54,6 +53,7 @@ if (MSVC)
5453
string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
5554
add_compile_options(/EHsc)
5655
add_compile_options(/Zc:__cplusplus)
56+
add_compile_options(/MP) # Allow multi parrallel build
5757

5858
if ("${CMAKE_GENERATOR}" MATCHES "(Win64|x64)")
5959
message(STATUS "Add /bigobj flag to compiler")

‎COMM-LICENSE‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2012-2021 Scott Chacon and others
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Instructions:
3636

3737
## If you want to build the project locally ##
3838

39-
See our detailed instructions on the [CMake README](/build/cmake/README.md).
39+
See our detailed instructions on the [CMake README](https://github.com/fnc12/sqlite_orm#usage).
4040

4141
## If you want to review open issues... ##
4242

0 commit comments

Comments
 (0)