mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion

Browse Source
This commit is contained in:
Brad King
2024-03-19 14:05:55 -04:00
parent 54d09a2b3f
commit ac25c645a7
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/CPack/WIX-v3/WIX.template.in
View File

@@ -2,7 +2,7 @@
<?include "cpack_variables.wxi"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" @CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"@CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
RequiredVersion="3.6.3303.0">
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"

15
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@@ -1184,12 +1184,7 @@ void cmCPackWIXGenerator::CollectExtensions(std::string const& variableName,
void cmCPackWIXGenerator::CollectXmlNamespaces(std::string const& variableName,
xmlns_map_t& namespaces)
{
cmValue variableContent = GetOption(variableName);
if (!variableContent) {
return;
}
cmList list{ variableContent };
cmList list{ GetOption(variableName) };
for (std::string const& str : list) {
auto pos = str.find('=');
if (pos != std::string::npos) {
@@ -1203,12 +1198,12 @@ void cmCPackWIXGenerator::CollectXmlNamespaces(std::string const& variableName,
<< str << '"' << std::endl);
}
}
std::ostringstream oss;
std::string xmlns;
for (auto& ns : namespaces) {
oss << " xmlns:" << ns.first << "=\""
<< cmWIXSourceWriter::EscapeAttributeValue(ns.second) << '"';
xmlns = cmStrCat(xmlns, "\n xmlns:", ns.first, "=\"",
cmWIXSourceWriter::EscapeAttributeValue(ns.second), '"');
}
SetOption("CPACK_WIX_CUSTOM_XMLNS_EXPANDED", oss.str());
SetOption("CPACK_WIX_CUSTOM_XMLNS_EXPANDED", xmlns);
}
void cmCPackWIXGenerator::AddCustomFlags(std::string const& variableName,