[Cmake-commits] CMake branch, next, updated. v2.8.6-2062-ga4a08ba

Brad King brad.king at kitware.com
Tue Nov 29 09:03:53 EST 2011


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  a4a08bac345af1e755e12a0abe9b88116f6e21fe (commit)
       via  ec4ba6a87502cccdb888e33e5a10298cba4f9914 (commit)
      from  af0d273e6dbf05ba6c3816e555338d607325b168 (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=a4a08bac345af1e755e12a0abe9b88116f6e21fe
commit a4a08bac345af1e755e12a0abe9b88116f6e21fe
Merge: af0d273 ec4ba6a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 29 09:03:51 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 29 09:03:51 2011 -0500

    Merge topic 'revert-target-include-directories' into next
    
    ec4ba6a Finish reverting target-include-directories merge into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec4ba6a87502cccdb888e33e5a10298cba4f9914
commit ec4ba6a87502cccdb888e33e5a10298cba4f9914
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 29 09:03:02 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 29 09:03:02 2011 -0500

    Finish reverting target-include-directories merge into next

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f603d0e..4e4f1d9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -232,7 +232,6 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
       if(ei->Language == "C" || ei->Language == "CXX")
         {
         lang_is_c_or_cxx = true;
-        break;
         }
       }
 
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 2137340..641c89f 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -30,8 +30,8 @@ class cmSystemTools: public cmsys::SystemTools
 public:
   typedef cmsys::SystemTools Superclass;
 
-  /** Expand out any arguments in the vector that have ; separated
-   *  strings into multiple arguments.  A new vector is created
+  /** Expand out any arguements in the vector that have ; separated
+   *  strings into multiple arguements.  A new vector is created
    *  containing the expanded versions of all arguments in argsIn.
    */
   static void ExpandList(std::vector<std::string> const& argsIn,

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    1 -
 Source/cmSystemTools.h                   |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list