[tinyorm] Suppress warning STL4043 (#35432)

This commit is contained in:
Cheney Wang 2023-12-01 18:02:41 +08:00 committed by GitHub
parent d606daa8f6
commit e732da23b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 4 deletions

View File

@ -1,9 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO silverqx/TinyORM
REF v0.36.5
REF "v${VERSION}"
SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
HEAD_REF main
PATCHES
suppress-warning-STL4043.patch
)
vcpkg_check_features(
@ -27,7 +29,6 @@ vcpkg_cmake_configure(
-DTINY_PORT:STRING=${PORT}
-DTINY_VCPKG:BOOL=ON
-DVERBOSE_CONFIGURE:BOOL=ON
-DWARNINGS_AS_ERRORS=FALSE
${FEATURE_OPTIONS}
)
@ -38,3 +39,5 @@ vcpkg_cmake_config_fixup()
if(TINYORM_TOM_EXAMPLE)
vcpkg_copy_tools(TOOL_NAMES tom AUTO_CLEAN)
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -0,0 +1,18 @@
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)

View File

@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tinyorm",
"version-semver": "0.36.5",
"port-version": 1,
"port-version": 2,
"maintainers": "Silver Zachara <silver.zachara@gmail.com>",
"description": "Modern C++ ORM library for Qt framework",
"homepage": "https://github.com/silverqx/TinyORM",

View File

@ -8478,7 +8478,7 @@
},
"tinyorm": {
"baseline": "0.36.5",
"port-version": 1
"port-version": 2
},
"tinyply": {
"baseline": "2.3.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d",
"version-semver": "0.36.5",
"port-version": 2
},
{
"git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba",
"version-semver": "0.36.5",