[Cmake-commits] CMake branch, next, updated. v2.8.5-1834-gab1d555

[David Cole]

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  ab1d5554e97667b3332da594e032a66f896cc21a (commit)
       via  96d106a78d1dc634cc635678afa399f1f5e15ff3 (commit)
      from  b39bee533db5e387d081d93668ef97595c2de497 (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=ab1d5554e97667b3332da594e032a66f896cc21a
commit ab1d5554e97667b3332da594e032a66f896cc21a
Merge: b39bee5 96d106a
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 6 17:45:28 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 6 17:45:28 2011 -0400

    Merge topic 'fix-12446-no-cmake-E-build' into next
    
    96d106a CMake: Remove documentation for -E build (#12446)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96d106a78d1dc634cc635678afa399f1f5e15ff3
commit 96d106a78d1dc634cc635678afa399f1f5e15ff3
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Tue Sep 6 08:28:20 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 6 17:42:32 2011 -0400

    CMake: Remove documentation for -E build (#12446)
    
    The '-E build build_dir' command was created and documented, but then
    morphed into '--build build_dir' instead, ... and then the -E documentation
    was never removed. This commit fixes that oversight.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2b8c718..a7924a4 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1112,7 +1112,6 @@ void CMakeCommandUsage(const char* program)
   errorStream
     << "Usage: " << program << " -E [command] [arguments ...]\n"
     << "Available commands: \n"
-    << "  build build_dir           - build the project in build_dir.\n"
     << "  chdir dir cmd [args]...   - run command in a given directory\n"
     << "  compare_files file1 file2 - check if file1 is same as file2\n"
     << "  copy file destination     - copy file to destination (either file "
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 9f213a5..436236d 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -72,7 +72,7 @@ static const char * cmDocumentationOptions[][3] =
   {"-E", "CMake command mode.",
    "For true platform independence, CMake provides a list of commands "
    "that can be used on all systems. Run with -E help for the usage "
-   "information. Commands available are: build, chdir, compare_files, copy, "
+   "information. Commands available are: chdir, compare_files, copy, "
    "copy_directory, copy_if_different, echo, echo_append, environment, "
    "make_directory, md5sum, remove, remove_directory, rename, tar, time, "
    "touch, touch_nocreate. In addition, some platform specific commands "

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

Summary of changes:
 Source/cmake.cxx     |    1 -
 Source/cmakemain.cxx |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake