diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-21 20:40:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-22 13:51:06 (GMT) |
| commit | d2f4836f8ed1144aa6f2883953e9db658211afe2 (patch) | |
| tree | e87c6483a6d631948538b3e9eeea99f119d5fef3 /Source | |
| parent | 438809d3ba074356a641f0a1665a8c3b6117648e (diff) | |
| download | CMake-d2f4836f8ed1144aa6f2883953e9db658211afe2.zip CMake-d2f4836f8ed1144aa6f2883953e9db658211afe2.tar.gz CMake-d2f4836f8ed1144aa6f2883953e9db658211afe2.tar.bz2 | |
CPack/WIX: Prepare to provide version-specific WiX templates
Move our template for WiX Toolset v3 to a versioned location.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 3cc09da..9a1d335 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<cm::string_view> alt; + alt = "WIX-v3/"_s; + wixTemplate = FindTemplate("WIX.template.in"_s, alt); } if (wixTemplate.empty()) { |