Skip to content

Commit 0b8587c

Browse files
committed
bundle up-to-date sqlite3 on all systems
ALTER TABLE .. RENAME COLUMN requires 3.25.0 or newer macOS 10.14 and Ubuntu 18.04 ship with older versions
1 parent 996e6dd commit 0b8587c

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.appveyor.yml

+3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ for:
9292
# don't use LibXml2/SQLite3 from Mono
9393
- sudo rm -r /Library/Frameworks/Mono.framework
9494

95+
# https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/
96+
- sudo curl -k https://curl.se/ca/cacert.pem -o /etc/ssl/cert.pem
97+
9598
# backport vcpkg bugfixes (TODO: remove after future image updates)
9699
- git -C ~/vcpkg fetch
97100
- git -C ~/vcpkg restore -s 38d6712d5644ede4ff597e889549f5d540dcf8ff ports/catch2

cmake/vcpkg-triplets/arch-env.cmake

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ endif()
44

55
if($ENV{ARCH} STREQUAL "x86_64")
66
set(VCPKG_TARGET_ARCHITECTURE x64)
7-
elseif($ENV{ARCH} STREQUAL "i386")
7+
elseif($ENV{ARCH} MATCHES "^i[36]86$")
88
set(VCPKG_TARGET_ARCHITECTURE x86)
9+
elseif($ENV{ARCH} STREQUAL "armv7l")
10+
set(VCPKG_TARGET_ARCHITECTURE arm)
11+
elseif($ENV{ARCH} STREQUAL "aarch64")
12+
set(VCPKG_TARGET_ARCHITECTURE arm64)
913
else()
1014
set(VCPKG_TARGET_ARCHITECTURE $ENV{ARCH})
1115
endif()

vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{ "name": "boost-range", "platform": "!linux" },
1111
"catch2",
1212
{ "name": "curl", "platform": "windows", "features": [ "non-http" ] },
13-
{ "name": "sqlite3", "platform": "windows" },
13+
"sqlite3",
1414
{ "name": "tinyxml2", "platform": "windows" }
1515
]
1616
}

0 commit comments

Comments
 (0)