Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

4 files changed, 43 insertions, 21 deletions

diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt
index b4b105a65..a2f0aeb03 100644
--- a/ports/sqlite3/CMakeLists.txt
+++ b/ports/sqlite3/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 project(sqlite3 C)
 
 include_directories(.)
@@ -9,13 +9,20 @@ else()
 endif()
 add_library(sqlite3 sqlite3.c)
 
-target_compile_definitions(sqlite3 PRIVATE
-    $<$<CONFIG:Debug>:SQLITE_DEBUG>
-    ${API}
-    -DSQLITE_ENABLE_RTREE
-    -DSQLITE_ENABLE_UNLOCK_NOTIFY
-    )
+target_compile_definitions(
+    sqlite3
+    PRIVATE
+        $<$<CONFIG:Debug>:SQLITE_DEBUG>
+        ${API}
+        -DSQLITE_ENABLE_RTREE
+        -DSQLITE_ENABLE_UNLOCK_NOTIFY
+        -DSQLITE_ENABLE_COLUMN_METADATA
+)
 target_include_directories(sqlite3 INTERFACE $<INSTALL_INTERFACE:include>)
+if(NOT WIN32)
+    find_package(Threads REQUIRED)
+    target_link_libraries(sqlite3 PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
+endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
     target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1)
@@ -32,11 +39,13 @@ if(NOT SQLITE3_SKIP_TOOLS)
     )
 endif()
 
-install(TARGETS sqlite3 EXPORT sqlite3Config
+install(
+    TARGETS sqlite3
+    EXPORT sqlite3
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
 )
 
 install(FILES sqlite3.h sqlite3ext.h DESTINATION include CONFIGURATIONS Release)
-install(EXPORT sqlite3Config DESTINATION share/sqlite3)
+install(EXPORT sqlite3 FILE sqlite3-targets.cmake DESTINATION share/sqlite3)
diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL
index 74d70909b..91ea02a14 100644
--- a/ports/sqlite3/CONTROL
+++ b/ports/sqlite3/CONTROL
@@ -1,5 +1,5 @@
 Source: sqlite3
-Version: 3.23.1-1
+Version: 3.25.2
 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
 
 Feature: tool
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index bd7bcc15c..b2422aecc 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -1,14 +1,19 @@
 include(vcpkg_common_functions)

 

-set(SQLITE_VERSION 3230100)

-set(SQLITE_HASH 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION})

+set(SQLITE_VERSION 3250200)

+set(SQLITE_HASH f87b4ab405f85df85b5d63e9e28c4db76202dc2d5461e0d0c626fa7521570d89a1122403c037704859ecb58ac1747ebf4b3c8a2f3a3c3d8492e8060df92e379f)

 

 vcpkg_download_distfile(ARCHIVE

     URLS "https://sqlite.org/2018/sqlite-amalgamation-${SQLITE_VERSION}.zip"

     FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip"

-    SHA512 ${SQLITE_HASH})

-vcpkg_extract_source_archive(${ARCHIVE})

+    SHA512 ${SQLITE_HASH}

+)

+

+vcpkg_extract_source_archive_ex(

+    OUT_SOURCE_PATH SOURCE_PATH

+    ARCHIVE ${ARCHIVE}

+    REF ${SQLITE_VERSION}

+)

 

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

 

@@ -27,14 +32,15 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

-

-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")

-    file(READ ${CURRENT_PACKAGES_DIR}/debug/share/sqlite3/sqlite3Config-debug.cmake SQLITE3_DEBUG_CONFIG)

-    string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" SQLITE3_DEBUG_CONFIG "${SQLITE3_DEBUG_CONFIG}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/sqlite3Config-debug.cmake "${SQLITE3_DEBUG_CONFIG}")

-endif()

+vcpkg_fixup_cmake_targets()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 

+configure_file(

+    ${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake

+    ${CURRENT_PACKAGES_DIR}/share/sqlite3/sqlite3-config.cmake

+    @ONLY

+)

+

 file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n")

 vcpkg_copy_pdbs()

diff --git a/ports/sqlite3/sqlite3-config.in.cmake b/ports/sqlite3/sqlite3-config.in.cmake
new file mode 100644
index 000000000..538342cf4
--- /dev/null
+++ b/ports/sqlite3/sqlite3-config.in.cmake
@@ -0,0 +1,7 @@
+

+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)

+    include(CMakeFindDependencyMacro)

+    find_dependency(Threads)

+endif()

+

+include(${CMAKE_CURRENT_LIST_DIR}/sqlite3-targets.cmake)