reapack

commit 0b8587c1a3f5e0adb1245c86e8c6049b92cabbbc
parent 996e6dd72ede4a25c723c38a1849e5ef5f566176
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Wed,  2 Mar 2022 15:08:06 -0500

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

Diffstat:
M
.appveyor.yml
 | 
3
+++
M
cmake/vcpkg-triplets/arch-env.cmake
 | 
6
+++++-
M
vcpkg.json
 | 
2
+-

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -92,6 +92,9 @@ for:
       # don't use LibXml2/SQLite3 from Mono
       - sudo rm -r /Library/Frameworks/Mono.framework
 
+      # https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/
+      - sudo curl -k https://curl.se/ca/cacert.pem -o /etc/ssl/cert.pem
+
       # backport vcpkg bugfixes (TODO: remove after future image updates)
       - git -C ~/vcpkg fetch
       - git -C ~/vcpkg restore -s 38d6712d5644ede4ff597e889549f5d540dcf8ff ports/catch2
diff --git a/cmake/vcpkg-triplets/arch-env.cmake b/cmake/vcpkg-triplets/arch-env.cmake
@@ -4,8 +4,12 @@ endif()
 
 if($ENV{ARCH} STREQUAL "x86_64")
   set(VCPKG_TARGET_ARCHITECTURE x64)
-elseif($ENV{ARCH} STREQUAL "i386")
+elseif($ENV{ARCH} MATCHES "^i[36]86$")
   set(VCPKG_TARGET_ARCHITECTURE x86)
+elseif($ENV{ARCH} STREQUAL "armv7l")
+  set(VCPKG_TARGET_ARCHITECTURE arm)
+elseif($ENV{ARCH} STREQUAL "aarch64")
+  set(VCPKG_TARGET_ARCHITECTURE arm64)
 else()
   set(VCPKG_TARGET_ARCHITECTURE $ENV{ARCH})
 endif()
diff --git a/vcpkg.json b/vcpkg.json
@@ -10,7 +10,7 @@
     { "name": "boost-range",        "platform": "!linux" },
     "catch2",
     { "name": "curl",     "platform": "windows", "features": [ "non-http" ] },
-    { "name": "sqlite3",  "platform": "windows" },
+    "sqlite3",
     { "name": "tinyxml2", "platform": "windows" }
   ]
 }