Skip to content

Update vcpkg #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liuzicheng1987 merged 2 commits into from
Sep 14, 2026
Merged

Update vcpkg #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef636b6
Update vcpkg
liuzicheng1987 Sep 7, 2026
66e61d9
Fix Windows MySQL test runtime DLLs
Copilot Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions tests/mysql/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,18 @@ add_custom_command(TARGET sqlgen-mysql-tests POST_BUILD
COMMAND_EXPAND_LISTS
)

if (WIN32 AND DEFINED VCPKG_TARGET_TRIPLET)
file(GLOB VCPKG_RUNTIME_DLLS
"${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/bin/*.dll"
)

if (VCPKG_RUNTIME_DLLS)
add_custom_command(TARGET sqlgen-mysql-tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VCPKG_RUNTIME_DLLS} $<TARGET_FILE_DIR:sqlgen-mysql-tests>
COMMAND_EXPAND_LISTS
)
endif()
endif()

find_package(GTest)
gtest_discover_tests(sqlgen-mysql-tests)
2 changes: 1 addition & 1 deletion vcpkg
Open in desktop
Submodule vcpkg updated 8368 files
2 changes: 1 addition & 1 deletion vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "git",
"baseline": "043abf2fa419c288d594a6b96b98a811457bd9b5",
"baseline": "04a9d8e5212d01ee1dd9478eadd9caade4f8b0d4",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
Expand Down
12 changes: 7 additions & 5 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"name": "duckdb",
"version>=": "1.4.2"
},
{
"name":"icu",
"version>=":"78.1"
}
{
"name": "icu",
"version>=": "78.1"
}
]
},
"mysql": {
Expand All @@ -43,7 +43,9 @@
{
"name": "sqlite3",
"version>=": "3.49.1",
"features": ["math"]
"features": [
"math"
]
}
]
},
Expand Down
Loading