Skip to content

[vcpkg_fixup_pkgconfig] Fix quoting #29792

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
dan-shaw merged 5 commits into from
Mar 15, 2023
Merged

[vcpkg_fixup_pkgconfig] Fix quoting #29792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7676722
[unit-test-cmake] Check pkgconfig quoting
dg0yt Feb 22, 2023
a7d6a69
[vcpkg_fixup_pkgconfig] Fix quoting
dg0yt Feb 22, 2023
05dc3bb
Merge branch 'microsoft:master' into pkgconfig-fixup
dg0yt Feb 23, 2023
b0333bb
Merge branch 'microsoft:master' into pkgconfig-fixup
dg0yt Mar 7, 2023
aa42bd2
Merge branch 'microsoft:master' into pkgconfig-fixup
dg0yt Mar 11, 2023
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
8 changes: 7 additions & 1 deletion scripts/cmake/vcpkg_fixup_pkgconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,14 @@ function(z_vcpkg_fixup_pkgconfig_process_data arg_variable arg_config arg_prefix
elseif(item MATCHES "^(-l|-L)?general")
continue()
endif()
if(item MATCHES "[\$`\"\\ ]")
if(item MATCHES [[.[\$]| ]] AND NOT item MATCHES [["]])
set(item "\"${item}\"")
else()
set(quoted "\"${item}\"")
string(FIND " ${libs} " " ${quoted} " index)
if(NOT index STREQUAL "-1")
set(item "${quoted}")
endif()
endif()
list(APPEND libs_filtered "${item}")
endforeach()
Expand Down
10 changes: 9 additions & 1 deletion scripts/test_ports/unit-test-cmake/test-vcpkg_fixup_pkgconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ function(unit_test_pkgconfig_check_key build_types field value)
set(expected "${field}${value}")
list(FILTER ${listname} INCLUDE REGEX "^${field}")
if(NOT "${${listname}}" STREQUAL "${expected}" AND NOT "${${listname}}_is_empty" STREQUAL "${value}_is_empty")
string(REPLACE "\$" "\\\$" pc_strings_INPUT "${pc_strings_INPUT}")
string(REPLACE "\$" "\\\$" expected "${expected}")
string(REPLACE "\$" "\\\$" "${listname}" "${${listname}}")
message(SEND_ERROR "vcpkg_fixup_pkgconfig() resulted in a wrong value for ${build_type} builds;
input: [[${pc_strings_INPUT}]]
input : [[${pc_strings_INPUT}]]
expected: [[${expected}]]
actual : [[${${listname}}]]")
set_has_error()
Expand Down Expand Up @@ -157,3 +160,8 @@ unit_test_pkgconfig_check_key("debug" "datadir=" [[${datarootdir}/unit-test-cmak
write_pkgconfig([[blah_libs=-L${blah}/lib64 -l${blah}/libblah.a -I${blah}/include]])
unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]])
unit_test_pkgconfig_check_key("debug;release" "blah_libs=" [["-L${blah}/lib64" "-l${blah}/libblah.a" "-I${blah}/include"]])

# plain vs. quoted items
write_pkgconfig([[Libs: ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]])
unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]])
unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]])