[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-589-g98f77b6

Rolf Eike Beer eike at sf-mail.de
Sun Feb 22 16:26:43 EST 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  98f77b65bf1848fd3b29c4fe3a4c2b041258aa58 (commit)
       via  51f8de810223139ea0dcb7bafcabe12fc8e075c1 (commit)
       via  5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2 (commit)
      from  3407f3cdc19ed352d4cd1145eca25b11adad6fdf (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=98f77b65bf1848fd3b29c4fe3a4c2b041258aa58
commit 98f77b65bf1848fd3b29c4fe3a4c2b041258aa58
Merge: 3407f3c 51f8de8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 22 16:26:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 16:26:42 2015 -0500

    Merge topic 'if-optimize' into next
    
    51f8de81 if(): avoid one needless string compare for all if() statements
    5cf629c3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51f8de810223139ea0dcb7bafcabe12fc8e075c1
commit 51f8de810223139ea0dcb7bafcabe12fc8e075c1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 22 13:48:30 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Feb 22 13:48:30 2015 +0100

    if(): avoid one needless string compare for all if() statements
    
    If it's known that it is an "if" it can't be an "elseif".

diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 3362abb..6dea5c1 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -45,7 +45,7 @@ IsFunctionBlocked(const cmListFileFunction& lff,
     {
     this->ScopeDepth++;
     }
-  if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endif"))
+  else if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endif"))
     {
     this->ScopeDepth--;
     // if this is the endif for this if statement, then start executing

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list