summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorjakoblover <jakob.lover@nordicsemi.no>2022-05-03 13:07:17 (GMT)
committerBrad King <brad.king@kitware.com>2022-05-05 13:11:57 (GMT)
commitcae7e5e38df6035779f1de473cf3debbc4a9260f (patch)
treefadf4bee0ca0c7612549e9a494650bf446f94308 /Help
parentef10e61b6b7d3bb264cdbf72e143dbef7be8c736 (diff)
downloadCMake-cae7e5e38df6035779f1de473cf3debbc4a9260f.zip
CMake-cae7e5e38df6035779f1de473cf3debbc4a9260f.tar.gz
CMake-cae7e5e38df6035779f1de473cf3debbc4a9260f.tar.bz2
CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/wix.rst9
-rw-r--r--Help/release/dev/cpack-wix-arch.rst6
2 files changed, 15 insertions, 0 deletions
diff --git a/Help/cpack_gen/wix.rst b/Help/cpack_gen/wix.rst
index e9d5af6..a3d43fc 100644
--- a/Help/cpack_gen/wix.rst
+++ b/Help/cpack_gen/wix.rst
@@ -328,3 +328,12 @@ Windows using WiX.
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.
+
+.. variable:: CPACK_WIX_ARCHITECTURE
+
+ .. versionadded:: 3.24
+
+ This variable can be optionally set to specify the target architecture
+ of the installer. May for example be set to ``x64`` or ``arm64``.
+
+ When unspecified, CPack will default to ``x64`` or ``x86``.
diff --git a/Help/release/dev/cpack-wix-arch.rst b/Help/release/dev/cpack-wix-arch.rst
new file mode 100644
index 0000000..e7fd1ad
--- /dev/null
+++ b/Help/release/dev/cpack-wix-arch.rst
@@ -0,0 +1,6 @@
+cpack-wix-arch
+--------------
+
+* The :cpack_gen:`CPack WIX Generator` gained a new variable,
+ :variable:`CPACK_WIX_ARCHITECTURE`, to specify the installer architecture
+ in order to support computers running Windows for ARM.