mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'wix_extension'

Browse Source 
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
This commit is contained in:
Brad King
2021-10-14 11:49:58 +00:00
committed by Kitware Robot
parent 0927c94f7d ed9dbe9218
commit fb35854484
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Help/cpack_gen/wix.rst
View File

@@ -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.

5
Help/release/dev/cpack-wix-skip-ui-ext.rst Normal file
View File

@@ -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

4
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@@ -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);