[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1389-g496f8bd

[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  496f8bdcaf4fde8f1b16e52668398d658dca091e (commit)
       via  bccc056ba86ede84b9f0acb066de97103a74268a (commit)
      from  4cc2eec542cd0dd8ffc221028e7867ed03a0ceab (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=496f8bdcaf4fde8f1b16e52668398d658dca091e
commit 496f8bdcaf4fde8f1b16e52668398d658dca091e
Merge: 4cc2eec bccc056
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 21 08:28:56 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 21 08:28:56 2014 -0400

    Merge topic 'remove-CMakeFiles-advice' into next
    
    bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bccc056ba86ede84b9f0acb066de97103a74268a
commit bccc056ba86ede84b9f0acb066de97103a74268a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 21 08:28:37 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 21 08:28:37 2014 -0400

    cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ede6842..2cf636c 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1413,8 +1413,8 @@ int cmake::ActualConfigure()
       message += "\nDoes not match the generator used previously: ";
       message += genName;
       message +=
-        "\nEither remove the CMakeCache.txt file or choose a different"
-        " binary directory.";
+        "\nEither remove the CMakeCache.txt file and CMakeFiles "
+        "directory or choose a different binary directory.";
       cmSystemTools::Error(message.c_str());
       return -2;
       }
@@ -1445,8 +1445,8 @@ int cmake::ActualConfigure()
       message += "\nDoes not match the toolset used previously: ";
       message += tsName;
       message +=
-        "\nEither remove the CMakeCache.txt file or choose a different"
-        " binary directory.";
+        "\nEither remove the CMakeCache.txt file and CMakeFiles "
+        "directory or choose a different binary directory.";
       cmSystemTools::Error(message.c_str());
       return -2;
       }

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

Summary of changes:
 Source/cmake.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake