diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-11-03 23:02:05 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2018-11-06 05:42:38 (GMT) |
| commit | 12deb051b368afcec39f58f9e3beb1c702051e74 (patch) | |
| tree | 93b0fc8b05a0d93eb5986d174a879a901c87887d /Help/cpack_gen/wix.rst | |
| parent | 20d5e77a270639a124fea587bb68b2fb6a5356fc (diff) | |
| download | CMake-12deb051b368afcec39f58f9e3beb1c702051e74.zip CMake-12deb051b368afcec39f58f9e3beb1c702051e74.tar.gz CMake-12deb051b368afcec39f58f9e3beb1c702051e74.tar.bz2 | |
Help: Use correct CPack generator names
CPack generator names were not used consistently
throughout the documentation, resulting in ambiguity
about what the correct name was for use with the
`cpack -G` option. With the changes in this commit, the
cpack-generators(7) page of the manual now shows the
correct names and other help pages no longer use
inconsistent or incorrect names.
Diffstat (limited to 'Help/cpack_gen/wix.rst')
| -rw-r--r-- | Help/cpack_gen/wix.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Help/cpack_gen/wix.rst b/Help/cpack_gen/wix.rst index fc8a098..dde4943 100644 --- a/Help/cpack_gen/wix.rst +++ b/Help/cpack_gen/wix.rst @@ -1,9 +1,9 @@ -CPack WiX Generator +CPack WIX Generator ------------------- -CPack WiX generator specific options +CPack WIX generator specific options -Variables specific to CPack WiX generator +Variables specific to CPack WIX generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following variables are specific to the installers built on @@ -50,11 +50,11 @@ Windows using WiX. If CPACK_RESOURCE_FILE_LICENSE has an .rtf extension it is used as-is. If CPACK_RESOURCE_FILE_LICENSE has an .txt extension it is implicitly - converted to RTF by the WiX Generator. + converted to RTF by the WIX Generator. The expected encoding of the .txt file is UTF-8. With CPACK_WIX_LICENSE_RTF you can override the license file used by the - WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported + WIX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported format or the .txt -> .rtf conversion does not work as expected. .. variable:: CPACK_WIX_PRODUCT_ICON @@ -122,10 +122,10 @@ Windows using WiX. generated WiX sources This optional variable can be used to specify an XML file that the - WiX generator will use to inject fragments into its generated + WIX generator will use to inject fragments into its generated source files. - Patch files understood by the CPack WiX generator + Patch files understood by the CPack WIX generator roughly follow this RELAX NG compact schema: .. code-block:: none @@ -155,7 +155,7 @@ Windows using WiX. The following example illustrates how this works. - Given that the WiX generator creates the following XML element: + Given that the WIX generator creates the following XML element: .. code-block:: xml |