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: Prepare to provide version-specific WiX templates

Browse Source 
Move our template for WiX Toolset v3 to a versioned location.
This commit is contained in:
Brad King
2024-03-21 16:40:27 -04:00
parent 438809d3ba
commit d2f4836f8e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

@@ -635,9 +635,13 @@ std::string cmCPackWIXGenerator::GetRootFolderId() const
bool cmCPackWIXGenerator::GenerateMainSourceFileFromTemplate()
{
std::string wixTemplate = FindTemplate("WIX.template.in");
std::string wixTemplate;
if (cmValue wixtpl = GetOption("CPACK_WIX_TEMPLATE")) {
wixTemplate = *wixtpl;
} else {
cm::optional<cm::string_view> alt;
alt = "WIX-v3/"_s;
wixTemplate = FindTemplate("WIX.template.in"_s, alt);
}
if (wixTemplate.empty()) {