Skip to content

[vcpkg scripts] fix relative_tool_dir debug match #44287

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
vicroms merged 2 commits into from
Mar 24, 2025
Merged

[vcpkg scripts] fix relative_tool_dir debug match #44287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d22defc
[scripts cmake]: fix relative_tool_dir debug match in vcpkg_copy_tool…
Mar 10, 2025
006742e
Update scripts/cmake/vcpkg_copy_tool_dependencies.cmake
olizit Mar 11, 2025
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
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_copy_tool_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function(vcpkg_copy_tool_dependencies tool_dir)
BASE_DIRECTORY "${CURRENT_PACKAGES_DIR}"
OUTPUT_VARIABLE relative_tool_dir
)
if(relative_tool_dir MATCHES "/debug/")
if(relative_tool_dir MATCHES "^debug/|/debug/")
z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/debug/bin")
z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/debug/bin")
else()
Expand Down
Loading