[Cmake-commits] CMake branch, next, updated. v3.2.2-3102-g9f5730d

Stephen Kelly steveire at gmail.com
Sun May 24 07:14:24 EDT 2015


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  9f5730d181bf686e829b4d322eb9763cd7914609 (commit)
       via  4fdad392b6ad59827866b8115bd554397e81ddb5 (commit)
       via  df9635f386aeac10e23495b2124d7713324e5c29 (commit)
      from  875ef0f9ec7c94d79a221367a28968f360c5a573 (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=9f5730d181bf686e829b4d322eb9763cd7914609
commit 9f5730d181bf686e829b4d322eb9763cd7914609
Merge: 875ef0f 4fdad39
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 07:14:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 07:14:23 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    4fdad392 cmake: Remove redundant forward declaration.
    df9635f3 cmake: Remove redundant condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fdad392b6ad59827866b8115bd554397e81ddb5
commit 4fdad392b6ad59827866b8115bd554397e81ddb5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 12:56:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 12:56:09 2015 +0200

    cmake: Remove redundant forward declaration.
    
    The appropriate include is already here.

diff --git a/Source/cmake.h b/Source/cmake.h
index 7f95fb6..c0a9b49 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -30,7 +30,6 @@ class cmDocumentationSection;
 class cmPolicies;
 class cmTarget;
 class cmGeneratedFileStream;
-class cmState;
 
 /** \brief Represents a cmake invocation.
  *

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df9635f386aeac10e23495b2124d7713324e5c29
commit df9635f386aeac10e23495b2124d7713324e5c29
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 12:55:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 12:55:43 2015 +0200

    cmake: Remove redundant condition.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index b4565e7..1c9842e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1620,11 +1620,6 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
   std::string message = "Build files have been written to: ";
   message += this->GetHomeOutputDirectory();
   this->UpdateProgress(message.c_str(), -1);
-  if(ret)
-    {
-    return ret;
-    }
-
   return ret;
 }
 

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

Summary of changes:
 Source/cmake.cxx |    5 -----
 Source/cmake.h   |    1 -
 2 files changed, 6 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list