mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-01 21:58:55 +08:00
33d9cd45ff
* [qt6] Update to 6.1.1 * version stuff * fix empty dir * update version * fix casing in qtbase * [libpq] add secure32.lib on windows * add clang-cl fix * version stuff * fix flag removal by adding a space * version stuff * make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q * fix libpq wrapper opensll linkage on linux * use policy to fix dependent ports * version stuff * use upstream patch * version stuff * fix source location for clang-cl * version stuff * remove ws change * version stuff
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
|
|
index 0eeccce..2ee41c2 100644
|
|
--- a/cmake/QtFlagHandlingHelpers.cmake
|
|
+++ b/cmake/QtFlagHandlingHelpers.cmake
|
|
@@ -421,7 +421,7 @@
|
|
# cache variable with FORCE will overwrite the non-cache variable in this
|
|
# function scope, but we need to use the original value before that change.
|
|
foreach(flag_value IN LISTS flag_values)
|
|
- string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}")
|
|
+ string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}")
|
|
endforeach()
|
|
string(STRIP "${${flag_var_name}}" ${flag_var_name})
|
|
set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE)
|
|
@@ -433,7 +433,7 @@
|
|
# Work exclusively on cache variable value only.
|
|
set(mod_flags $CACHE{${flag_var_name}})
|
|
foreach(flag_value IN LISTS flag_values)
|
|
- string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}")
|
|
+ string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}")
|
|
endforeach()
|
|
string(STRIP "${mod_flags}" mod_flags)
|
|
get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING)
|