diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-09 13:45:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-09 13:45:57 (GMT) |
| commit | 6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa (patch) | |
| tree | eb3141d4ff7c6af3173bfd21c5723c28d27dd10e /Modules | |
| parent | 3f66bde4f70566166437dc4d7c9beaeba1ee33ee (diff) | |
| parent | 2e16aff1e2218f042f403971403fe583fc5bec97 (diff) | |
| download | CMake-6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa.zip CMake-6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa.tar.gz CMake-6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa.tar.bz2 | |
Merge topic 'fix-wixobj-filenames'
2e16aff1 CPackWIX: Fix .wixobj output locations and filenames.
b0852ebc CPackWIX: Support patching of root <Feature> elements.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 105df96..5fe51a6 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -148,8 +148,10 @@ # Currently fragments can be injected into most # Component, File and Directory elements. # -# The special Id ``#PRODUCT`` can be used to inject content -# into the ``<Product>`` element. +# The following additional special Ids can be used: +# +# * ``#PRODUCT`` for the ``<Product>`` element. +# * ``#PRODUCTFEATURE`` for the root ``<Feature>`` element. # # The following example illustrates how this works. # |