diff --git a/Modules/Internal/CPack/WIX.template.in b/Modules/Internal/CPack/WIX-v3/WIX.template.in similarity index 100% rename from Modules/Internal/CPack/WIX.template.in rename to Modules/Internal/CPack/WIX-v3/WIX.template.in diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 3cc09daf38..9a1d335199 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/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 alt; + alt = "WIX-v3/"_s; + wixTemplate = FindTemplate("WIX.template.in"_s, alt); } if (wixTemplate.empty()) {