From 13940af99a201e29599911632894f62dea0e5db2 Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka Date: Sat, 1 Apr 2017 23:35:08 +0300 Subject: [PATCH 1/2] [sqlite3] fix uwp builds --- ports/sqlite3/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index fdf4ec159..40a0d8a16 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DSOURCE=${SOURCE_PATH} + -DVCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} ) vcpkg_build_cmake() vcpkg_install_cmake() From e5a4f033170d66ec53f23a5366a3c8e896fdc1ea Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka Date: Sat, 1 Apr 2017 23:35:22 +0300 Subject: [PATCH 2/2] [sqlite3] update to 3.18.0 --- ports/sqlite3/CONTROL | 2 +- ports/sqlite3/portfile.cmake | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index bc5b4af98..f1d9bde16 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,3 +1,3 @@ Source: sqlite3 -Version: 3.17.0 +Version: 3.18.0-1 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. \ No newline at end of file diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 40a0d8a16..1b906fba5 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,16 +1,20 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3170000) + +set(SQLITE_VERSION 3180000) +set(SQLITE_HASH d390c1d83afc27ec184ea6ab392477647cc80eb97ca177797cd494409c5646435c7a84502cc74ded1b654af13e65d2eef444bb0255a127e59d2cf40d5d0c1192) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION}) + vcpkg_download_distfile(ARCHIVE - URLS "https://sqlite.org/2017/sqlite-amalgamation-3170000.zip" - FILENAME "sqlite-amalgamation-3170000.zip" - SHA512 36dc05dbb21428237332e813181d4dd0c2ffaedb92a53934630c25421617afd9c1a65784665d222501f1b4b5c6445f425f8c512572a97e42603510dcc0796344 -) + URLS "https://sqlite.org/2017/sqlite-amalgamation-${SQLITE_VERSION}.zip" + FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" + SHA512 ${SQLITE_HASH}) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSOURCE=${SOURCE_PATH} -DVCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}