[sqlite3] Fix option passing (microsoft#32404)

mstorsjo · Jul 11, 2023 · be82dd7 · be82dd7
1 parent efd6ced
commit be82dd7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
@@ -25,15 +25,21 @@ else()
     set(SQLITE_API "")
 endif()
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS Unused
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        fts5                SQLITE_ENABLE_FTS5
+        math                SQLITE_ENABLE_MATH_FUNCTIONS
+        zlib                WITH_ZLIB
+    INVERTED_FEATURES
+        tool                SQLITE3_SKIP_TOOLS
+)
+vcpkg_check_features(OUT_FEATURE_OPTIONS none # only using the script-mode side-effects
     FEATURES
         dbstat              SQLITE_ENABLE_DBSTAT_VTAB
         fts3                SQLITE_ENABLE_FTS3
         fts4                SQLITE_ENABLE_FTS4
-        fts5                SQLITE_ENABLE_FTS5
         memsys3             SQLITE_ENABLE_MEMSYS3
         memsys5             SQLITE_ENABLE_MEMSYS5
-        math                SQLITE_ENABLE_MATH_FUNCTIONS
         limit               SQLITE_ENABLE_UPDATE_DELETE_LIMIT
         rtree               SQLITE_ENABLE_RTREE
         session             SQLITE_ENABLE_SESSION
@@ -57,13 +63,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/sqlite3-vcpkg-config.h.in" "${SOURCE_PATH}/sqlite3-vcpkg-config.h" @ONLY)
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        zlib                WITH_ZLIB
-    INVERTED_FEATURES
-        tool                SQLITE3_SKIP_TOOLS
-)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "sqlite3",
   "version": "3.42.0",
+  "port-version": 1,
   "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.",
   "homepage": "https://sqlite.org/",
   "license": "blessing",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7778,7 +7778,7 @@
     },
     "sqlite3": {
       "baseline": "3.42.0",
-      "port-version": 0
+      "port-version": 1
     },
     "sqlitecpp": {
       "baseline": "3.3.0",

diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3414b2e79fd240d315ac9fc1165fc376966c8322",
+      "version": "3.42.0",
+      "port-version": 1
+    },
     {
       "git-tree": "a1b6deae3ce2f17e1384f02e7da3e7fae3a0865d",
       "version": "3.42.0",