diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-03 18:53:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-03 18:53:24 (GMT) |
| commit | 1a25113959a7c6a35d3b5da61d498ca71b4b9766 (patch) | |
| tree | a312ae4f3e9e407a1a6db3b8db8dc97f71382a29 | |
| parent | 9f8975a1a9438d506b1c223f8a37fb5276032ec0 (diff) | |
| parent | 3793dca08a41fd9199e65ff834b839b4f65397c7 (diff) | |
| download | CMake-1a25113959a7c6a35d3b5da61d498ca71b4b9766.zip CMake-1a25113959a7c6a35d3b5da61d498ca71b4b9766.tar.gz CMake-1a25113959a7c6a35d3b5da61d498ca71b4b9766.tar.bz2 | |
Merge topic 'fix-13789-wix-ui-enhancements'
3793dca CPack: WIX Product Icon, UI Banner, UI Dialog support (#13789)
| -rw-r--r-- | Modules/CPackWIX.cmake | 26 | ||||
| -rw-r--r-- | Modules/WIX.template.in | 13 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 3 |
3 files changed, 42 insertions, 0 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index f278953..0c0a8f1 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -49,6 +49,32 @@ # by the WiX Generator in case CPACK_RESOURCE_FILE_LICENSE # is in an unsupported format or the .txt -> .rtf # conversion does not work as expected. +# +##end +# +##variable +# CPACK_WIX_PRODUCT_ICON - The Icon shown next to the program name in Add/Remove programs. +# +# If set, this icon is used in place of the default icon. +# +##end +# +##variable +# CPACK_WIX_UI_BANNER - The bitmap will appear at the top of all installer pages other than the welcome and completion dialogs. +# +# If set, this image will replace the default banner image. +# +# This image must be 493 by 58 pixels. +# +##end +# +##variable +# CPACK_WIX_UI_DIALOG - Background bitmap used on the welcome and completion dialogs. +# +# If this variable is set, the installer will replace the default dialog image. +# +# This image must be 493 by 312 pixels. +# ##end #============================================================================= diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in index 63fad7c..0bc7e10 100644 --- a/Modules/WIX.template.in +++ b/Modules/WIX.template.in @@ -24,6 +24,19 @@ <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/> <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/> + <?ifdef CPACK_WIX_PRODUCT_ICON?> + <Property Id="ARPPRODUCTICON">ProductIcon.ico</Property> + <Icon Id="ProductIcon.ico" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/> + <?endif?> + + <?ifdef CPACK_WIX_UI_BANNER?> + <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/> + <?endif?> + + <?ifdef CPACK_WIX_UI_DIALOG?> + <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/> + <?endif?> + <FeatureRef Id="ProductFeature"/> <UIRef Id="WixUI_InstallDir" /> diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 8b58625..e8b0ea9 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -221,6 +221,9 @@ bool cmCPackWIXGenerator::CreateWiXVariablesIncludeFile() CopyDefinition(includeFile, "CPACK_PACKAGE_NAME"); CopyDefinition(includeFile, "CPACK_PACKAGE_VERSION"); CopyDefinition(includeFile, "CPACK_WIX_LICENSE_RTF"); + CopyDefinition(includeFile, "CPACK_WIX_PRODUCT_ICON"); + CopyDefinition(includeFile, "CPACK_WIX_UI_BANNER"); + CopyDefinition(includeFile, "CPACK_WIX_UI_DIALOG"); return true; } |