diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
| commit | aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch) | |
| tree | fd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Modules/WIX.template.in | |
| parent | faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff) | |
| parent | d64ee80d6bfb97a63953796074e792f4883e5fb2 (diff) | |
| download | CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2 | |
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
Diffstat (limited to 'Modules/WIX.template.in')
| -rw-r--r-- | Modules/WIX.template.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in index 59a75c7..bbb7c88 100644 --- a/Modules/WIX.template.in +++ b/Modules/WIX.template.in @@ -40,5 +40,7 @@ <FeatureRef Id="ProductFeature"/> <UIRef Id="$(var.CPACK_WIX_UI_REF)" /> + + <?include "properties.wxi"?> </Product> </Wix> |