diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-14 11:49:58 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-14 07:50:29 -0400 |
| commit | fb358544843a56d433a40862faa397a2b0e1f460 (patch) | |
| tree | 86369232d006a67a1914090426f4fe68415f72f7 /Source/CPack | |
| parent | 0927c94f7d51a3ae9e8b900309ae07a90d04b0c2 (diff) | |
| parent | ed9dbe9218628f1123c8e8b45579c2f20362466b (diff) | |
| download | cmake-fb358544843a56d433a40862faa397a2b0e1f460.tar.gz | |
Merge topic 'wix_extension'
ed9dbe9218 CPack/WiX: Add option to skip the WixUIExtension
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6619
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index d03239b521..6a0095b708 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -219,7 +219,9 @@ bool cmCPackWIXGenerator::InitializeWiXConfiguration() CollectExtensions("CPACK_WIX_EXTENSIONS", this->CandleExtensions); CollectExtensions("CPACK_WIX_CANDLE_EXTENSIONS", this->CandleExtensions); - this->LightExtensions.insert("WixUIExtension"); + if (!cmIsOn(GetOption("CPACK_WIX_SKIP_WIX_UI_EXTENSION"))) { + this->LightExtensions.insert("WixUIExtension"); + } CollectExtensions("CPACK_WIX_EXTENSIONS", this->LightExtensions); CollectExtensions("CPACK_WIX_LIGHT_EXTENSIONS", this->LightExtensions); CollectXmlNamespaces("CPACK_WIX_CUSTOM_XMLNS", this->CustomXmlNamespaces); |