[sqlitecpp] do not use stack protection (#25761)

* do not use stack protection
fixes #25760

* update version

* update baseline

* only remove stack protection for mingw64

* update version

* Make variable visible even if unused

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* update version

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Reder 2022-07-19 00:09:27 +02:00 committed by GitHub
parent 870165b0f6
commit 8b7ac186bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions

View File

@ -14,6 +14,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
sqlcipher SQLITE_HAS_CODEC sqlcipher SQLITE_HAS_CODEC
) )
set(USE_STACK_PROTECTION "")
if(VCPKG_TARGET_IS_MINGW)
set(USE_STACK_PROTECTION "-DSQLITECPP_USE_STACK_PROTECTION=OFF")
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -25,6 +29,7 @@ vcpkg_configure_cmake(
-DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF
-DSQLITE_ENABLE_COLUMN_METADATA=OFF -DSQLITE_ENABLE_COLUMN_METADATA=OFF
-DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF
${USE_STACK_PROTECTION}
) )
vcpkg_install_cmake() vcpkg_install_cmake()

View File

@ -1,7 +1,7 @@
{ {
"name": "sqlitecpp", "name": "sqlitecpp",
"version-string": "3.1.1", "version-string": "3.1.1",
"port-version": 1, "port-version": 2,
"description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.",
"homepage": "https://github.com/SRombauts/SQLiteCpp", "homepage": "https://github.com/SRombauts/SQLiteCpp",
"default-features": [ "default-features": [

View File

@ -6838,7 +6838,7 @@
}, },
"sqlitecpp": { "sqlitecpp": {
"baseline": "3.1.1", "baseline": "3.1.1",
"port-version": 1 "port-version": 2
}, },
"sqlpp11": { "sqlpp11": {
"baseline": "0.61", "baseline": "0.61",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2b16a053ff6df932be1e7b02ad0b34dff2a03cf5",
"version-string": "3.1.1",
"port-version": 2
},
{ {
"git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b",
"version-string": "3.1.1", "version-string": "3.1.1",