Browse Source

CPack/WIX: Prepare to provide version-specific WiX templates

Move our template for WiX Toolset v3 to a versioned location.
Brad King 1 year ago
parent
commit
d2f4836f8e

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


+ 5 - 1
Source/CPack/WiX/cmCPackWIXGenerator.cxx

@@ -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()) {