Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[sqlite-orm] Update SQLite ORM to 1.8 #28988

Merged
merged 9 commits into from
Jan 31, 2023
Merged

[sqlite-orm] Update SQLite ORM to 1.8 #28988

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dee916c
Merge remote-tracking branch 'upstream/master'
trueqbit Jan 14, 2023
026d331
[sqlite-orm] Update to 1.8.0
trueqbit Jan 15, 2023
d6df62a
[sqlite-orm] Added "license" field to manifest
trueqbit Jan 24, 2023
e94d6cf
[sqlite-orm] Update to 1.8.1
trueqbit Jan 28, 2023
19141fc
[sqlite-orm] Corrected deprecated license
trueqbit Jan 28, 2023
ebd658f
[sqlite-orm] Removed unmerged 1.8.0 version from versions file
trueqbit Jan 28, 2023
79919ee
[sqlite-orm] Revert: Removed unmerged 1.8.0 version from versions file
trueqbit Jan 28, 2023
d2c0130
[sqlite-orm] Ran `.\vcpkg x-add-version sqlite-orm` again
trueqbit Jan 29, 2023
9d46ea3
[sqlite-orm] Removed unmerged 1.8.0 version from versions file
trueqbit Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/sqlite-orm/fix-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in
index e0635d2..30403cd 100644
index e0635d28a..30403cd41 100644
--- a/cmake/SqliteOrmConfig.cmake.in
+++ b/cmake/SqliteOrmConfig.cmake.in
@@ -1,4 +1,4 @@
Expand Down
14 changes: 7 additions & 7 deletions ports/sqlite-orm/fix-features-build-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 436d30a6d..d64f3cbb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,15 +31,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -35,15 +35,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
include(CTest)

### Dependencies
Expand All @@ -20,7 +21,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2857b65..3ee46e6 100644
index 2857b659e..3ee46e625 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,5 +4,5 @@ file(GLOB files "*.cpp")
Expand All @@ -31,15 +32,14 @@ index 2857b65..3ee46e6 100644
+ target_link_libraries(${file_basename} PRIVATE sqlite_orm)
endforeach()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fd41e70..8087899 100644
index f1095b369..2b0d188dd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -0,6 +0,8 @@
@@ -1,5 +1,7 @@
cmake_minimum_required (VERSION 3.2)

option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF)
+
+find_package(Catch2 CONFIG REQUIRED)
+
option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF)

add_executable(unit_tests
tests.cpp
5 changes: 3 additions & 2 deletions ports/sqlite-orm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fnc12/sqlite_orm
REF v1.7.1
SHA512 ab934959245e8e0aaefd543ef0c1ab336547e4c311aff9dda916c7577c006622dec917313350d0d8bde4366d42b458c915fc2ea2fb927c01910fe429e55c8bbc
REF v1.8
SHA512 fee858078c8dfcd5dad170b395a458f2fc54702a965236a446efa59e3c38b0feb9bfe4e18ca0b8b35c741af5ea4a3b12aeecf0edf955bcec6b67641742288b42
HEAD_REF master
PATCHES
fix-features-build-error.patch
Expand All @@ -22,6 +22,7 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
-DSQLITE_ORM_ENABLE_CXX_17=OFF
-DSQLITE_ORM_ENABLE_CXX_20=OFF
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/sqlite-orm/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sqlite-orm",
"version": "1.7.1",
"version": "1.8.0",
"description": "SQLite ORM light header only library for modern C++",
"homepage": "https://github.com/fnc12/sqlite_orm",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7309,7 +7309,7 @@
"port-version": 1
},
"sqlite-orm": {
"baseline": "1.7.1",
"baseline": "1.8.0",
"port-version": 0
},
"sqlite3": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sqlite-orm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a264108d68b73d47e82f31984be134b7c0d73b85",
"version": "1.8.0",
"port-version": 0
},
trueqbit marked this conversation as resolved.
Show resolved Hide resolved
{
"git-tree": "a065a6f10e3d75198b433530fd91853eb691c325",
"version": "1.7.1",
Expand Down