diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 1144965d11899f..882a8a88781cc5 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -6,6 +6,7 @@ option(WITH_ZLIB "Build sqlite3 with zlib support" OFF) option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF) set(PKGCONFIG_LIBS_PRIVATE "") +set(PKGCONFIG_REQUIRES_PRIVATE "") add_library(sqlite3 sqlite3.c sqlite3.rc) @@ -45,6 +46,13 @@ if (NOT WIN32) endif() endif() +if(SQLITE_ENABLE_ICU) + find_package(ICU COMPONENTS uc i18n REQUIRED) + target_link_libraries(sqlite3 PRIVATE ICU::uc ICU::i18n) + + string(APPEND PKGCONFIG_REQUIRES_PRIVATE "icu-uc icu-i18n") +endif() + if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) set_target_properties(sqlite3-bin PROPERTIES diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index de5bc8ba593cbe..0ed7b077ad778a 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS fts5 SQLITE_ENABLE_FTS5 math SQLITE_ENABLE_MATH_FUNCTIONS zlib WITH_ZLIB + unicode SQLITE_ENABLE_ICU INVERTED_FEATURES tool SQLITE3_SKIP_TOOLS ) diff --git a/ports/sqlite3/sqlite3-vcpkg-config.h.in b/ports/sqlite3/sqlite3-vcpkg-config.h.in index d46d6e1c3fe326..47b0f4a4f3c505 100644 --- a/ports/sqlite3/sqlite3-vcpkg-config.h.in +++ b/ports/sqlite3/sqlite3-vcpkg-config.h.in @@ -30,3 +30,4 @@ #define SQLITE_ENABLE_COLUMN_METADATA 1 #cmakedefine SQLITE_OS_UNIX @SQLITE_OS_UNIX@ #cmakedefine SQLITE_ENABLE_DBSTAT_VTAB +#cmakedefine SQLITE_ENABLE_ICU diff --git a/ports/sqlite3/sqlite3.pc.in b/ports/sqlite3/sqlite3.pc.in index d265632d119930..6f0e809d11211b 100644 --- a/ports/sqlite3/sqlite3.pc.in +++ b/ports/sqlite3/sqlite3.pc.in @@ -8,4 +8,5 @@ Description: SQL database engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lsqlite3 Libs.private: @PKGCONFIG_LIBS_PRIVATE@ +Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@ Cflags: -I${includedir} diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index cff3a3b394b167..e3bd66a41289b9 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite3", "version": "3.47.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", @@ -70,6 +71,12 @@ "description": "Build sqlite3 executable", "supports": "!uwp" }, + "unicode": { + "description": "Enable unicode support", + "dependencies": [ + "icu" + ] + }, "zlib": { "description": "Build sqlite3 command line tool with zlib support; has no effect on the library itself", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 822c2d56e2cbfb..00b37c584e0f71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8598,7 +8598,7 @@ }, "sqlite3": { "baseline": "3.47.0", - "port-version": 0 + "port-version": 1 }, "sqlitecpp": { "baseline": "3.3.2", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index df177b852cd166..036f4176332ccf 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a28f9bb5f7c9a1b985a6ad77d1f3b22e9a543fcb", + "version": "3.47.0", + "port-version": 1 + }, { "git-tree": "e1627228f6b8f4dd39e51e29b34c7b5ea1c304ba", "version": "3.47.0",