[Cmake-commits] CMake branch, next, updated. v3.1.1-2314-gfce896b

[Brad King]

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  fce896b44813a1babddc2451d26223e7dfdfae45 (commit)
       via  6cc0f6b512d08caabf088d22f3f25432e6307b6a (commit)
      from  8bc5b3cfb1b0e7af49b9e0c6a4c269b5be273f5a (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=fce896b44813a1babddc2451d26223e7dfdfae45
commit fce896b44813a1babddc2451d26223e7dfdfae45
Merge: 8bc5b3c 6cc0f6b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 09:46:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 09:46:52 2015 -0500

    Merge topic 'load-initial-cache-from-stderr-to-stdout' into next
    
    6cc0f6b5 cmake: Display "loading initial cache" message on stdout


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cc0f6b512d08caabf088d22f3f25432e6307b6a
commit 6cc0f6b512d08caabf088d22f3f25432e6307b6a
Author:     Jean-Christophe Fillion-Robin <jchris.fillionr at kitware.com>
AuthorDate: Sat Jan 24 20:15:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 09:44:44 2015 -0500

    cmake: Display "loading initial cache" message on stdout
    
    This message has been on stderr since the "-C" option was first added,
    but it is informational and not an error.  Other informational messages
    go to stdout, so send this one there too.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 29d8206..652e451 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -437,7 +437,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
           return false;
           }
         }
-      std::cerr << "loading initial cache file " << path << "\n";
+      std::cout << "loading initial cache file " << path << "\n";
       this->ReadListFile(args, path.c_str());
       }
     else if(arg.find("-P",0) == 0)

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

Summary of changes:
 Source/cmake.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake