[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1960-g2c8c851

Stephen Kelly steveire at gmail.com
Thu Feb 7 04:00:24 EST 2013


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  2c8c851fd53d0955000364060f9c41cf0b5f3937 (commit)
       via  9f04495f0538a5d4a795efef2c51cf7d9f605000 (commit)
      from  4057effc4de213e948a5e8be78ce4a01d13140e5 (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=2c8c851fd53d0955000364060f9c41cf0b5f3937
commit 2c8c851fd53d0955000364060f9c41cf0b5f3937
Merge: 4057eff 9f04495
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 04:00:22 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 04:00:22 2013 -0500

    Merge topic 'minor-fixes' into next
    
    9f04495 Fix warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f04495f0538a5d4a795efef2c51cf7d9f605000
commit 9f04495f0538a5d4a795efef2c51cf7d9f605000
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 09:59:14 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 7 09:59:14 2013 +0100

    Fix warning.

diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index b766113..808806a 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -51,7 +51,7 @@ std::string cmTargetIncludeDirectoriesCommand
     it != content.end(); ++it)
     {
     if (cmSystemTools::FileIsFullPath(it->c_str())
-        || cmGeneratorExpression::Find(*it) != -1)
+        || cmGeneratorExpression::Find(*it) != std::string::npos)
       {
       dirs += sep + *it;
       }

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list