[Cmake-commits] CMake branch, next, updated. v2.8.7-3410-gd2c9c85

David Cole david.cole at kitware.com
Thu Apr 5 16:15:10 EDT 2012


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  d2c9c8527d648f52d0e6c213f450f8dd8d8cf0c6 (commit)
       via  fcf265fe1a76de13c674a067eba043489f30279b (commit)
      from  e66f92f9dbf33819934139b077f92681ba8b740d (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=d2c9c8527d648f52d0e6c213f450f8dd8d8cf0c6
commit d2c9c8527d648f52d0e6c213f450f8dd8d8cf0c6
Merge: e66f92f fcf265f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Apr 5 16:15:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 5 16:15:08 2012 -0400

    Merge topic 'CPackNSIS-smallDocTypoFix' into next
    
    fcf265f CPackNSIS: Rewrite variable documentation to make it more readable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf265fe1a76de13c674a067eba043489f30279b
commit fcf265fe1a76de13c674a067eba043489f30279b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Apr 5 16:13:24 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Apr 5 16:13:24 2012 -0400

    CPackNSIS: Rewrite variable documentation to make it more readable.
    
    And avoid parsing problems at the first "."

diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 90f6536..5e2ba17 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -15,12 +15,14 @@
 ##end
 #
 ##variable
-#   CPACK_NSIS_MUI_ICON - The icon file (<dot>ico) for the generated
+#   CPACK_NSIS_MUI_ICON - An icon filename.
+#   The name of a *.ico file used as the main icon for the generated
 #   install program.
 ##end
 #
 ##variable
-#   CPACK_NSIS_MUI_UNIICON - The icon file (<dot>ico) for the generated
+#   CPACK_NSIS_MUI_UNIICON - An icon filename.
+#   The name of a *.ico file used as the main icon for the generated
 #   uninstall program.
 ##end
 #

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

Summary of changes:
 Modules/CPackNSIS.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list