mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 09:23:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sqlite3] Fix tool installation with zlib (#31050)

Browse Source 
* [sqlite3] Fix tool installation with zlib

* Disambiguate PDB

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Kai Pastor 2023-04-26 07:54:48 +02:00 committed by GitHub
parent a5a49292cc
commit d18847f621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/sqlite3/CMakeLists.txt
View File

@ -46,6 +46,10 @@ endif()
if(NOT SQLITE3_SKIP_TOOLS) if(NOT SQLITE3_SKIP_TOOLS)
add_executable(sqlite3-bin shell.c) add_executable(sqlite3-bin shell.c)
set_target_properties(sqlite3-bin PROPERTIES
OUTPUT_NAME sqlite3
PDB_NAME "sqlite3${CMAKE_EXECUTABLE_SUFFIX}.pdb"
)
target_link_libraries(sqlite3-bin PRIVATE sqlite3) target_link_libraries(sqlite3-bin PRIVATE sqlite3)
if (WITH_ZLIB) if (WITH_ZLIB)
@ -55,7 +59,7 @@ if(NOT SQLITE3_SKIP_TOOLS)
endif() endif()
install(TARGETS sqlite3-bin sqlite3 install(TARGETS sqlite3-bin sqlite3
RUNTIME DESTINATION tools RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
) )

4
ports/sqlite3/portfile.cmake
View File

@ -78,8 +78,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unoff
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") if("tool" IN_LIST FEATURES)
file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") vcpkg_copy_tools(TOOL_NAMES sqlite3 DESTINATION "${CURRENT_PACKAGES_DIR}/tools" AUTO_CLEAN)
endif() endif()
configure_file( configure_file(

2
ports/sqlite3/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "sqlite3", "name": "sqlite3",
"version": "3.40.1", "version": "3.40.1",
"port-version": 2, "port-version": 3,
"description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.",
"homepage": "https://sqlite.org/", "homepage": "https://sqlite.org/",
"license": "blessing", "license": "blessing",

2
versions/baseline.json
View File

@ -7590,7 +7590,7 @@
}, },
"sqlite3": { "sqlite3": {
"baseline": "3.40.1", "baseline": "3.40.1",
"port-version": 2 "port-version": 3
}, },
"sqlitecpp": { "sqlitecpp": {
"baseline": "3.2.0", "baseline": "3.2.0",

5
versions/s-/sqlite3.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "846077eab115952eeb4dda0eaae97a3eb776fa9f",
"version": "3.40.1",
"port-version": 3
},
{ {
"git-tree": "6bb52479b5ab874f6283e585a3bf2294f52966ca", "git-tree": "6bb52479b5ab874f6283e585a3bf2294f52966ca",
"version": "3.40.1", "version": "3.40.1",