[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1332-g506da2e

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  506da2efd1bd0ca5189d3d1b483435513a2ec2e0 (commit)
       via  3793dca08a41fd9199e65ff834b839b4f65397c7 (commit)
       via  fb2db0e470002c372decf2aae2447de2cf27384c (commit)
       via  539c222de029a8063f84ba528dd58b021f091e35 (commit)
       via  94933a5ec9a28909c4cb6fc883a4bb8da8c31ef0 (commit)
       via  a73294b9080bb1fbef889b29c0216f8bf47913bf (commit)
       via  4d580517a963138d5d22823b0827396d2864d3b0 (commit)
      from  af21a9d522360b67535de89a210d7e0f77995a4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=506da2efd1bd0ca5189d3d1b483435513a2ec2e0
commit 506da2efd1bd0ca5189d3d1b483435513a2ec2e0
Merge: af21a9d 3793dca
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Dec 28 15:40:18 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 28 15:40:18 2012 -0500

    Merge topic 'fix-13789-wix-ui-enhancements' into next
    
    3793dca CPack: WIX Product Icon, UI Banner, UI Dialog support (#13789)
    fb2db0e CMake Nightly Date Stamp
    539c222 CMake Nightly Date Stamp
    94933a5 CMake Nightly Date Stamp
    a73294b CMake Nightly Date Stamp
    4d58051 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3793dca08a41fd9199e65ff834b839b4f65397c7
commit 3793dca08a41fd9199e65ff834b839b4f65397c7
Author:     Eric LaFranchi <eric at lafranchi.com>
AuthorDate: Fri Dec 14 12:50:18 2012 -0800
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Dec 28 15:32:15 2012 -0500

    CPack: WIX Product Icon, UI Banner, UI Dialog support (#13789)

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;
 }

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackWIX.cmake                   |   26 ++++++++++++++++++++++++++
 Modules/WIX.template.in                  |   13 +++++++++++++
 Source/CMakeVersion.cmake                |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    3 +++
 4 files changed, 43 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake