[Cmake-commits] CMake branch, next, updated. v2.8.8-2941-g0d3ebe5

[Eric Noulard]

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  0d3ebe5498e274bdacf67e1b8638327774cdfc28 (commit)
       via  cfc11f9bff95c8332b31741056481d24e0db83f6 (commit)
       via  b639549c671c4921938935180f0690ed8910ce3d (commit)
      from  1a69094c751d8e72bd54c5551c36a600200dc035 (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=0d3ebe5498e274bdacf67e1b8638327774cdfc28
commit 0d3ebe5498e274bdacf67e1b8638327774cdfc28
Merge: 1a69094 cfc11f9
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon May 28 11:18:40 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 28 11:18:40 2012 -0400

    Merge topic 'cpack-nsis-menu-links-adapted' into next
    
    cfc11f9 CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.
    b639549 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfc11f9bff95c8332b31741056481d24e0db83f6
commit cfc11f9bff95c8332b31741056481d24e0db83f6
Author:     Fraser Hutchison <fraser.hutchison at maidsafe.net>
AuthorDate: Mon May 28 16:59:51 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon May 28 17:15:29 2012 +0200

    CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.
    
    This was a pull request: https://github.com/Kitware/CMake/pull/5
    
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 481fd2b..7b52511 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -543,8 +543,8 @@ void cmCPackNSISGenerator::CreateMenuLinks( cmOStringStream& str,
     {
     cmCPackLogger(
       cmCPackLog::LOG_ERROR,
-      "CPACK_PACKAGE_EXECUTABLES should contain pairs of <executable> and "
-      "<icon name>." << std::endl);
+      "CPACK_NSIS_MENU_LINKS should contain pairs of <shortcut target> and "
+      "<shortcut label>." << std::endl);
     return;
     }
 

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

Summary of changes:
 Source/CMakeVersion.cmake             |    2 +-
 Source/CPack/cmCPackNSISGenerator.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake