[Cmake-commits] CMake branch, next, updated. v3.3.2-1469-g7581b99

[Brad King]

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  7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (commit)
       via  3758af12fab8bc3c6279400621be94c4aa540a70 (commit)
       via  3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit)
      from  6d62f50d47b15612ecfd7d29d9826edea2893d54 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7581b99a1b8fd2ae3f4b92c530c73fd35649ccae
commit 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae
Merge: 6d62f50 3758af1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:10:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:10:06 2015 -0400

    Merge topic 'cpack-nsis-bitmap' into next
    
    3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
    3709e950 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3758af12fab8bc3c6279400621be94c4aa540a70
commit 3758af12fab8bc3c6279400621be94c4aa540a70
Author:     Colin Tracey <ctracey at nvidia.com>
AuthorDate: Fri Sep 25 15:06:08 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:08:37 2015 -0400

    CPackNSIS: Add options to set the bitmap for NSIS installer left side
    
    set MUI_WELCOMEFINISHPAGE_BITMAP
    set MUI_UNWELCOMEFINISHPAGE_BITMAP

diff --git a/Help/release/dev/cpack-nsis-bitmap.rst b/Help/release/dev/cpack-nsis-bitmap.rst
new file mode 100644
index 0000000..c5ccfb5
--- /dev/null
+++ b/Help/release/dev/cpack-nsis-bitmap.rst
@@ -0,0 +1,6 @@
+cpack-nsis-bitmap
+-----------------
+
+* The :module:`CPackNSIS` module learned new variables to add bitmaps to the
+  installer.  See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP`
+  and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables.
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index c6b3d19..db5984a 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -30,6 +30,14 @@
 #
 #  undocumented.
 #
+# .. variable:: CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP
+#
+#  The filename of a bitmap to use as the NSIS MUI_WELCOMEFINISHPAGE_BITMAP.
+#
+# .. variable:: CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP
+#
+#  The filename of a bitmap to use as the NSIS MUI_UNWELCOMEFINISHPAGE_BITMAP.
+#
 # .. variable:: CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS
 #
 #  Extra NSIS commands that will be added to the beginning of the install
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 76310af..1ef3d28 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -542,6 +542,8 @@ FunctionEnd
 ; Define some macro setting for the gui
 @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
 @CPACK_NSIS_INSTALLER_ICON_CODE@
+ at CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@
+ at CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@
 @CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
 @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@
 
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 6cdda28..705b864 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -158,6 +158,28 @@ int cmCPackNSISGenerator::PackageFiles()
                             installerIconCode.c_str());
     }
 
+  if (this->IsSet("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP"))
+    {
+    std::string installerBitmapCode =
+      "!define MUI_WELCOMEFINISHPAGE_BITMAP \"";
+    installerBitmapCode +=
+      this->GetOption("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP");
+    installerBitmapCode += "\"\n";
+    this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE",
+                            installerBitmapCode.c_str());
+    }
+
+  if (this->IsSet("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP"))
+    {
+    std::string installerBitmapCode =
+      "!define MUI_UNWELCOMEFINISHPAGE_BITMAP \"";
+    installerBitmapCode +=
+      this->GetOption("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP");
+    installerBitmapCode += "\"\n";
+    this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE",
+                            installerBitmapCode.c_str());
+    }
+
   if(this->IsSet("CPACK_NSIS_MUI_FINISHPAGE_RUN"))
     {
     std::string installerRunCode = "!define MUI_FINISHPAGE_RUN \"$INSTDIR\\";

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

Summary of changes:
 Help/release/dev/cpack-nsis-bitmap.rst |    6 ++++++
 Modules/CPackNSIS.cmake                |    8 ++++++++
 Modules/NSIS.template.in               |    2 ++
 Source/CMakeVersion.cmake              |    2 +-
 Source/CPack/cmCPackNSISGenerator.cxx  |   22 ++++++++++++++++++++++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/cpack-nsis-bitmap.rst


hooks/post-receive
-- 
CMake