aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsanjaychugh <schugh@shaw.ca>2020-08-14 11:29:18 -0600
committerGitHub <noreply@github.com>2020-08-14 10:29:18 -0700
commit7c5ea94190a9aa1ecb56a7388dd05c444a114421 (patch)
tree4da41092546124c355b96fc29e401b68c58c6f66
parent5562c695df38d82ac971d4326d5f511284d36699 (diff)
downloadvcpkg-7c5ea94190a9aa1ecb56a7388dd05c444a114421.tar.gz
vcpkg-7c5ea94190a9aa1ecb56a7388dd05c444a114421.zip
[sqlite3] Sqlite3 geopoly and json1 features (#11532)
* sqlite3 port: add geopoly and json features. * Changed the version of the sqlite3 CONTROL from from 3.31.1-1 to 3.31.1-2 * Update CONTROL * Update CONTROL Co-authored-by: Sanjay Chugh <schugh@intelligenetimagingsystems.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: LilyWangL <wangli28@beyondsoft.com>
-rw-r--r--ports/sqlite3/CMakeLists.txt9
-rw-r--r--ports/sqlite3/CONTROL6
-rw-r--r--ports/sqlite3/portfile.cmake3
3 files changed, 18 insertions, 0 deletions
diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt
index d803fc03c..6250eb711 100644
--- a/ports/sqlite3/CMakeLists.txt
+++ b/ports/sqlite3/CMakeLists.txt
@@ -24,6 +24,15 @@ target_compile_definitions(
-DSQLITE_ENABLE_UNLOCK_NOTIFY
-DSQLITE_ENABLE_COLUMN_METADATA
)
+
+if(WITH_GEOPOLY)
+ add_compile_definitions(SQLITE_ENABLE_GEOPOLY)
+endif()
+
+if(WITH_JSON1)
+ add_compile_definitions(SQLITE_ENABLE_JSON1)
+endif()
+
target_include_directories(sqlite3 INTERFACE $<INSTALL_INTERFACE:include>)
if(NOT WIN32)
find_package(Threads REQUIRED)
diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL
index 0d17c801e..01df1c91a 100644
--- a/ports/sqlite3/CONTROL
+++ b/ports/sqlite3/CONTROL
@@ -6,3 +6,9 @@ Description: SQLite is a software library that implements a self-contained, serv
Feature: tool
Description: sqlite3 executable
+
+Feature: geopoly
+Description: enable geopoly functionality for sqlite3
+
+Feature: json1
+Description: enable JSON functionality for sqlite3
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index 2e1d2fb6f..7a1a5775e 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -17,6 +17,9 @@ vcpkg_extract_source_archive_ex(
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
)