From a07c1574afbba7d51eab514f62974d49bcb7dbe6 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Fri, 10 Sep 2021 12:06:12 +0800
Subject: [sqlite3] update to 3.36.0 (#19847)

* [sqlite3] update to 3.36.0

* update version
---
 ports/sqlite3/portfile.cmake | 33 ++++++++++++++++-----------------
 ports/sqlite3/vcpkg.json     | 12 +++++++++++-
 versions/baseline.json       |  2 +-
 versions/s-/sqlite3.json     |  5 +++++
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index 49322da59..d843ee537 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -1,5 +1,5 @@
-set(SQLITE_VERSION 3350500)
-set(SQLITE_HASH 9684fee89224f0c975c280cb6b2c64adb040334bc5517dfe0e354b0557459fa3ae642c4289a7a5265f65b3ad5b6747db8068a1e5172fbb8edec7f6d964ecbb20)
+set(SQLITE_VERSION 3360000)
+set(SQLITE_HASH 5c18f158a599b1e91d95c91de3aa5c5de52f986845ad0cb49dfd56b650587e55e24d469571b5b864229b870d0eaf85d78893f61ef950b95389cb41692be37f58)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip"
@@ -14,36 +14,35 @@ vcpkg_extract_source_archive_ex(
     PATCHES fix-arm-uwp.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-    geopoly WITH_GEOPOLY
-    json1 WITH_JSON1
-    INVERTED_FEATURES
-    tool SQLITE3_SKIP_TOOLS
+        geopoly WITH_GEOPOLY
+        json1 WITH_JSON1
+        INVERTED_FEATURES
+        tool SQLITE3_SKIP_TOOLS
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
     OPTIONS_DEBUG
         -DSQLITE3_SKIP_TOOLS=ON
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT})
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX})
-    file(RENAME ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX})
+if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 endif()
 
 configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake
-    ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake
+    "${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake"
     @ONLY
 )
 
diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json
index 60d162c85..f5054f6f8 100644
--- a/ports/sqlite3/vcpkg.json
+++ b/ports/sqlite3/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "sqlite3",
-  "version": "3.35.5",
+  "version": "3.36.0",
   "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.",
   "homepage": "https://sqlite.org/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "features": {
     "geopoly": {
       "description": "enable geopoly functionality for sqlite3"
diff --git a/versions/baseline.json b/versions/baseline.json
index ac2efba1c..5ad0793bd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6149,7 +6149,7 @@
       "port-version": 1
     },
     "sqlite3": {
-      "baseline": "3.35.5",
+      "baseline": "3.36.0",
       "port-version": 0
     },
     "sqlitecpp": {
diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json
index 3e7c20563..2154ae868 100644
--- a/versions/s-/sqlite3.json
+++ b/versions/s-/sqlite3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c23525b0204e11a56d40cbb0b7fa68861450df04",
+      "version": "3.36.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2b5a7327445e4b113d53a988cc7b0619e5abc77f",
       "version": "3.35.5",
-- 
cgit v1.2.3