[Cmake-commits] CMake branch, next, updated. v2.8.9-155-ge1610af

[Stephen Kelly]

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  e1610afa52e341631038f5e524533a2ea0e60344 (commit)
       via  ecc1acb94cbfa12045ec94e11013cbfe6a3bd136 (commit)
       via  805f5e5c1e32c878b63e10f167e667a05a460f3e (commit)
       via  389d42317743952e2e78393601c20b826ce95d30 (commit)
      from  31007c03c763a61f693543e33277871cea55925f (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=e1610afa52e341631038f5e524533a2ea0e60344
commit e1610afa52e341631038f5e524533a2ea0e60344
Merge: 31007c0 ecc1acb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 19 18:07:16 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 19 18:07:16 2012 -0400

    Merge topic 'minor-docs-fixes' into next
    
    ecc1acb Remove incorrect doc string for link type enum
    805f5e5 Fix some typos in the docs.
    389d423 Add missing whitespace to docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecc1acb94cbfa12045ec94e11013cbfe6a3bd136
commit ecc1acb94cbfa12045ec94e11013cbfe6a3bd136
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 19 23:11:13 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 20 00:05:03 2012 +0200

    Remove incorrect doc string for link type enum
    
    This is actually a duplicate doc string for a method a few lines above.

diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a89c5d9..98eaeec 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -158,9 +158,6 @@ public:
   void AddSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSource(const char* src);
 
-  /**
-   * Get the list of the source files used by this target
-   */
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 
   //* how we identify a library, by name and type

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=805f5e5c1e32c878b63e10f167e667a05a460f3e
commit 805f5e5c1e32c878b63e10f167e667a05a460f3e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 19 22:05:16 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Aug 19 23:31:09 2012 +0200

    Fix some typos in the docs.
    
    s/static the static/the static/
    
    Make Visual Studio capitalized.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 05ef8fc..943d219 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -827,9 +827,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "Tell cmake to use MFC for an executable or dll.",
      "This can be set in a CMakeLists.txt file and will "
      "enable MFC in the application.  It should be set "
-     "to 1 for static the static MFC library, and 2 for "
-     "the shared MFC library.  This is used in visual "
-     "studio 6 and 7 project files.   The CMakeSetup "
+     "to 1 for the static MFC library, and 2 for "
+     "the shared MFC library.  This is used in Visual "
+     "Studio 6 and 7 project files.   The CMakeSetup "
      "dialog used MFC and the CMakeLists.txt looks like this:\n"
      "  add_definitions(-D_AFXDLL)\n"
      "  set(CMAKE_MFC_FLAG 2)\n"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=389d42317743952e2e78393601c20b826ce95d30
commit 389d42317743952e2e78393601c20b826ce95d30
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 17 22:09:08 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Aug 19 23:31:09 2012 +0200

    Add missing whitespace to docs.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 775662c..6398912 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -903,7 +903,7 @@ void cmTarget::DefineProperties(cmake *cm)
      "Build an executable with a WinMain entry point on windows.",
      "When this property is set to true the executable when linked "
      "on Windows will be created with a WinMain() entry point instead "
-     "of of just main()."
+     "of of just main().  "
      "This makes it a GUI executable instead of a console application.  "
      "See the CMAKE_MFC_FLAG variable documentation to configure use "
      "of MFC for WinMain executables.  "

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

Summary of changes:
 Source/cmDocumentVariables.cxx |    6 +++---
 Source/cmTarget.cxx            |    2 +-
 Source/cmTarget.h              |    3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake