diff options
| author | Alexey Gruzdev <alex.gruzdev@hotmail.com> | 2018-04-30 19:31:00 +0100 |
|---|---|---|
| committer | Alexey Gruzdev <alex.gruzdev@hotmail.com> | 2018-04-30 19:31:00 +0100 |
| commit | c72e6326dd4df3096144fe5cd510dc525ec39c9a (patch) | |
| tree | 60b0d79153a484f6879ac4cf53d31c01950d1b5d /ports/sqlite3 | |
| parent | 5897e96f9328584177fe9c13ce6b2db64d089962 (diff) | |
| parent | a9d989ec056246ea320a56ca7d02b161a6fee387 (diff) | |
| download | vcpkg-c72e6326dd4df3096144fe5cd510dc525ec39c9a.tar.gz vcpkg-c72e6326dd4df3096144fe5cd510dc525ec39c9a.zip | |
Merge remote-tracking branch 'remotes/origin/master' into dev/agruzdev/yato
Diffstat (limited to 'ports/sqlite3')
| -rw-r--r-- | ports/sqlite3/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/sqlite3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sqlite3/portfile.cmake | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 7d6e20dee..b4b105a65 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -9,7 +9,7 @@ else() endif() add_library(sqlite3 sqlite3.c) -target_compile_definitions(sqlite3 PRIVATE +target_compile_definitions(sqlite3 PRIVATE $<$<CONFIG:Debug>:SQLITE_DEBUG> ${API} -DSQLITE_ENABLE_RTREE @@ -25,7 +25,11 @@ if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) set_target_properties(sqlite3-bin PROPERTIES OUTPUT_NAME sqlite3) target_link_libraries(sqlite3-bin PRIVATE sqlite3) - install(TARGETS sqlite3-bin sqlite3 RUNTIME DESTINATION tools) + install(TARGETS sqlite3-bin sqlite3 + RUNTIME DESTINATION tools + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) endif() install(TARGETS sqlite3 EXPORT sqlite3Config diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index a5d76d43b..74d70909b 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,5 @@ Source: sqlite3 -Version: 3.23.0 +Version: 3.23.1-1 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 d016660ab..bd7bcc15c 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions)
-set(SQLITE_VERSION 3230000)
-set(SQLITE_HASH bfca2ec16d926c11c9ec052eae41549f1de392582227ca08eb8a01cc36e58ac528c7677fdab253250ba3e0cf6e5cd9d3d0012e5b558be7db91740ac901dae0fe)
+set(SQLITE_VERSION 3230100)
+set(SQLITE_HASH 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION})
vcpkg_download_distfile(ARCHIVE
|