mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 06:59:07 +08:00
[tinyorm] Update to v0.37.3 (#38388)
Bugfix release. New TinyDrivers feature can't be enabled in vcpkg as it violates the Maintainer guide: Do not use features to implement alternatives - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
This commit is contained in:
parent
675281dd1f
commit
28b1cf627c
@ -2,12 +2,13 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO silverqx/TinyORM
|
||||
REF "v${VERSION}"
|
||||
SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
|
||||
SHA512 f82702d712f845624698f799c7f5d2b30b7d2138f6c4c15e7ca50b316254b55b6606f60ce4356d7156b615b636a6b16e2d1923901825759e54ab60499c4f04cd
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
suppress-warning-STL4043.patch
|
||||
)
|
||||
|
||||
# STL4043 _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING already defined, see:
|
||||
# https://github.com/silverqx/TinyORM/blob/main/cmake/CommonModules/TinyCommon.cmake#L122
|
||||
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
PREFIX TINYORM
|
||||
@ -24,8 +25,10 @@ vcpkg_check_features(
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DCMAKE_CXX_SCAN_FOR_MODULES:BOOL=OFF
|
||||
-DCMAKE_EXPORT_PACKAGE_REGISTRY:BOOL=OFF
|
||||
-DBUILD_TESTS:BOOL=OFF
|
||||
-DBUILD_TREE_DEPLOY:BOOL=OFF
|
||||
-DTINY_PORT:STRING=${PORT}
|
||||
-DTINY_VCPKG:BOOL=ON
|
||||
-DVERBOSE_CONFIGURE:BOOL=ON
|
||||
|
@ -1,18 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8b6f2cd..7a2e32f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,6 +41,13 @@ project(${TinyOrm_ns}
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED YES)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
+
|
||||
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.38.32914.95")
|
||||
+ add_compile_options(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
# Set the AUTOMOC property explicitly only when needed (eg. unit tests need AUTOMOC)
|
||||
set(CMAKE_AUTOMOC OFF)
|
||||
|
@ -1,8 +1,7 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "tinyorm",
|
||||
"version-semver": "0.36.5",
|
||||
"port-version": 2,
|
||||
"version-semver": "0.37.3",
|
||||
"maintainers": "Silver Zachara <silver.zachara@gmail.com>",
|
||||
"description": "Modern C++ ORM library for Qt framework",
|
||||
"homepage": "https://github.com/silverqx/TinyORM",
|
||||
@ -12,10 +11,7 @@
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"sql"
|
||||
]
|
||||
"default-features": false
|
||||
},
|
||||
"range-v3",
|
||||
"tabulate",
|
||||
@ -34,6 +30,12 @@
|
||||
"tom"
|
||||
],
|
||||
"features": {
|
||||
"build-mysql-driver": {
|
||||
"description": "Build TinyDrivers MySQL database driver (provided by TinyDrivers)",
|
||||
"dependencies": [
|
||||
"libmysql"
|
||||
]
|
||||
},
|
||||
"disable-thread-local": {
|
||||
"description": "Remove all thread_local storage duration specifiers (disables multi-threading support)"
|
||||
},
|
||||
@ -50,7 +52,7 @@
|
||||
"description": "Enable ORM-related source code (without it only the query builder is compiled)"
|
||||
},
|
||||
"sql-mysql": {
|
||||
"description": "Build Qt SQL Driver for MySQL",
|
||||
"description": "Build Qt SQL MySQL database driver (provided by QtSql)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
@ -62,7 +64,7 @@
|
||||
]
|
||||
},
|
||||
"sql-psql": {
|
||||
"description": "Build Qt SQL Driver for PostgreSQL",
|
||||
"description": "Build Qt SQL PostgreSQL database driver (provided by QtSql)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
@ -74,7 +76,7 @@
|
||||
]
|
||||
},
|
||||
"sql-sqlite": {
|
||||
"description": "Build Qt SQL Driver for SQLite",
|
||||
"description": "Build Qt SQL SQLite database driver (provided by QtSql)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
|
@ -8713,8 +8713,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"tinyorm": {
|
||||
"baseline": "0.36.5",
|
||||
"port-version": 2
|
||||
"baseline": "0.37.3",
|
||||
"port-version": 0
|
||||
},
|
||||
"tinyply": {
|
||||
"baseline": "2.3.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0ad6d66e3a6fd539a71bb6cb331ff27c5bcff17a",
|
||||
"version-semver": "0.37.3",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d",
|
||||
"version-semver": "0.36.5",
|
||||
|
Loading…
Reference in New Issue
Block a user