1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix escaping in recording of provided targets

Browse Source 
In diff of below change, patch set 4 to 5, the list(APPEND) was
replaced with a string(APPEND), but the escaping of semicolons was not
removed. This caused an issue with packages that provide multiple
targets when configuring qtsvg in a static qt build.

Remove the unnecessary escaping.

Amends 58eefbd0b6169d0749b312268c1ae1e594e04362

Pick-to: 6.8
Change-Id: I1755f31b333e7cf76722cff490349bcc159d7e93
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2024-06-20 18:25:29 +02:00
parent 7dc67d9897
commit 9279a2f60e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtPostProcessHelpers.cmake
View File

@ -105,9 +105,6 @@ function(qt_internal_collect_third_party_dep_packages_info
get_cmake_property(provided_targets _qt_find_package_${package_key}_provided_targets) get_cmake_property(provided_targets _qt_find_package_${package_key}_provided_targets)
if(provided_targets) if(provided_targets)
set(key "__qt_${target}_third_party_package_${package_key}_provided_targets") set(key "__qt_${target}_third_party_package_${package_key}_provided_targets")
# Escape the semicolon, so it is preserved in the list(JOIN) below
string(REPLACE ";" "\;" provided_targets "${provided_targets}")
string(APPEND packages_info "set(${key} \"${provided_targets}\")\n") string(APPEND packages_info "set(${key} \"${provided_targets}\")\n")
endif() endif()
endforeach() endforeach()