[Cmake-commits] CMake branch, next, updated. v3.2.1-1015-g76f1200

[Nils Gladitz]

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  76f12008700b61362056b2d84420becd0983c3e6 (commit)
       via  1bda8f1fdbfdeef82766e5db542b1946d5e2167d (commit)
      from  388339d0539cdba1ae195e025e50c1263a85dd2c (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=76f12008700b61362056b2d84420becd0983c3e6
commit 76f12008700b61362056b2d84420becd0983c3e6
Merge: 388339d 1bda8f1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Mar 12 15:46:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 12 15:46:50 2015 -0400

    Merge topic 'wix-installer-theme' into next
    
    1bda8f1f CPackWIX: Customize CMake installer theme.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bda8f1fdbfdeef82766e5db542b1946d5e2167d
commit 1bda8f1fdbfdeef82766e5db542b1946d5e2167d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Mar 12 20:44:27 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Mar 12 20:44:27 2015 +0100

    CPackWIX: Customize CMake installer theme.

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index cc8f5e9..5600b35 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -109,4 +109,12 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
   )
 
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high")
+
+  set(CPACK_WIX_UI_BANNER
+    "@CMake_SOURCE_DIR@/Utilities/Release/cpack_wix_ui_banner.jpg"
+  )
+
+  set(CPACK_WIX_UI_DIALOG
+    "@CMake_SOURCE_DIR@/Utilities/Release/cpack_wix_ui_dialog.jpg"
+  )
 endif()
diff --git a/Utilities/Release/cpack_wix_ui_banner.jpg b/Utilities/Release/cpack_wix_ui_banner.jpg
new file mode 100644
index 0000000..8d950a6
Binary files /dev/null and b/Utilities/Release/cpack_wix_ui_banner.jpg differ
diff --git a/Utilities/Release/cpack_wix_ui_dialog.jpg b/Utilities/Release/cpack_wix_ui_dialog.jpg
new file mode 100644
index 0000000..bb6fa5b
Binary files /dev/null and b/Utilities/Release/cpack_wix_ui_dialog.jpg differ

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

Summary of changes:
 CMakeCPackOptions.cmake.in                |    8 ++++++++
 Utilities/Release/cpack_wix_ui_banner.jpg |  Bin 0 -> 2607 bytes
 Utilities/Release/cpack_wix_ui_dialog.jpg |  Bin 0 -> 13369 bytes
 3 files changed, 8 insertions(+)
 create mode 100644 Utilities/Release/cpack_wix_ui_banner.jpg
 create mode 100644 Utilities/Release/cpack_wix_ui_dialog.jpg


hooks/post-receive
-- 
CMake