[Cmake-commits] CMake branch, next, updated. v2.8.7-2525-gf2b7a47

[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  f2b7a4781f9f3fcda3647eafd43b8b967a118b6a (commit)
       via  6a74eb1d36b079fe6b566244a636ac1e43303aa6 (commit)
      from  7c20788c16f5092060d27c3d7741f8685d67ded9 (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=f2b7a4781f9f3fcda3647eafd43b8b967a118b6a
commit f2b7a4781f9f3fcda3647eafd43b8b967a118b6a
Merge: 7c20788 6a74eb1
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 8 18:40:15 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 18:40:15 2012 -0500

    Merge topic 'CPackNSIS-fixIgnore-INCLUDE_TOPLEVEL' into next
    
    6a74eb1 CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a74eb1d36b079fe6b566244a636ac1e43303aa6
commit 6a74eb1d36b079fe6b566244a636ac1e43303aa6
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Feb 5 13:13:48 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Feb 5 13:13:48 2012 +0100

    CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 2b94067..0787ef9 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -344,9 +344,9 @@ int cmCPackNSISGenerator::InitializeInternal()
   if ( cmSystemTools::IsOn(this->GetOption(
         "CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) )
     {
-    cmCPackLogger(cmCPackLog::LOG_ERROR,
-      "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY. "
-      "This option will be ignored."
+    cmCPackLogger(cmCPackLog::LOG_WARNING,
+      "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY set. "
+      "This option will be reset to 0 (for this generator only)."
       << std::endl);
     this->SetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", 0);
     }

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

Summary of changes:
 Source/CPack/cmCPackNSISGenerator.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake