diff options
| author | Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> | 2021-10-12 17:30:09 (GMT) |
|---|---|---|
| committer | Vasileios Anagnostopoulos <vasileios.anagnostopoulos@autoform.ch> | 2021-10-12 18:41:00 (GMT) |
| commit | ed9dbe9218628f1123c8e8b45579c2f20362466b (patch) | |
| tree | 0e815f4e6abbc39fe1c3ca15d891209a196789ec | |
| parent | 6f1fe83f865edb276aa78dd9f5dda1dbebcf21e3 (diff) | |
| download | CMake-ed9dbe9218628f1123c8e8b45579c2f20362466b.zip CMake-ed9dbe9218628f1123c8e8b45579c2f20362466b.tar.gz CMake-ed9dbe9218628f1123c8e8b45579c2f20362466b.tar.bz2 | |
CPack/WiX: Add option to skip the WixUIExtension
Fixes: #22747
| -rw-r--r-- | Help/cpack_gen/wix.rst | 8 | ||||
| -rw-r--r-- | Help/release/dev/cpack-wix-skip-ui-ext.rst | 5 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Help/cpack_gen/wix.rst b/Help/cpack_gen/wix.rst index 79f835e..e9d5af6 100644 --- a/Help/cpack_gen/wix.rst +++ b/Help/cpack_gen/wix.rst @@ -320,3 +320,11 @@ Windows using WiX. name is the plain namespace without the usual xmlns: prefix and url is an unquoted namespace url. A list of commonly known WiX schemata can be found here: https://wixtoolset.org/documentation/manual/v3/xsd/ + +.. variable:: CPACK_WIX_SKIP_WIX_UI_EXTENSION + + .. versionadded:: 3.23 + + If this variable is set then the inclusion of WixUIExtensions is skipped, + i.e. the ``-ext "WixUIExtension"`` command line is not included during + the execution of the WiX light tool. diff --git a/Help/release/dev/cpack-wix-skip-ui-ext.rst b/Help/release/dev/cpack-wix-skip-ui-ext.rst new file mode 100644 index 0000000..e139469 --- /dev/null +++ b/Help/release/dev/cpack-wix-skip-ui-ext.rst @@ -0,0 +1,5 @@ +cpack-wix-skip-ui-ext +--------------------- + +* An option to the WiX Generator was added to be able to skip + the inclusion of the WixUIExtensions diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index d03239b..6a0095b 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); |