[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-586-g3407f3c

[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  3407f3cdc19ed352d4cd1145eca25b11adad6fdf (commit)
       via  135febf069e7ff5305a3729b81171933ec89dc90 (commit)
      from  235f381ba46a49aca8f029b3e9a7c00fb564b19b (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=3407f3cdc19ed352d4cd1145eca25b11adad6fdf
commit 3407f3cdc19ed352d4cd1145eca25b11adad6fdf
Merge: 235f381 135febf
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Feb 22 09:21:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 09:21:31 2015 -0500

    Merge topic 'wix-shortcut-properties' into next
    
    135febf0 CPackWIX: Enhance CMake CPack WIX generated installer.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=135febf069e7ff5305a3729b81171933ec89dc90
commit 135febf069e7ff5305a3729b81171933ec89dc90
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Feb 22 15:20:33 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sun Feb 22 15:20:33 2015 +0100

    CPackWIX: Enhance CMake CPack WIX generated installer.

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 57ed4ca..cc8f5e9 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -87,4 +87,26 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
   if(patch MATCHES "^[0-9]+$" AND patch LESS 65535)
     set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.${patch}")
   endif()
+
+  set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "http://www.cmake.org")
+
+  set(CPACK_WIX_PROPERTY_ARPCONTACT "@CPACK_PACKAGE_CONTACT@")
+
+  set(CPACK_WIX_PROPERTY_ARPCOMMENTS
+    "CMake is a cross-platform, open-source build system."
+  )
+
+  set(CPACK_WIX_PRODUCT_ICON
+    "@CMake_SOURCE_DIR@/Utilities/Release/CMakeLogo.ico"
+  )
+
+  set_property(INSTALL "@CMAKE_DOC_DIR@/html/index.html" PROPERTY
+    CPACK_START_MENU_SHORTCUTS "CMake Documentation"
+  )
+
+  set_property(INSTALL "cmake.org.html" PROPERTY
+    CPACK_START_MENU_SHORTCUTS "CMake Web Site"
+  )
+
+  set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high")
 endif()

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

Summary of changes:
 CMakeCPackOptions.cmake.in |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)


hooks/post-receive
-- 
CMake