[Cmake-commits] CMake branch, next, updated. v2.8.7-2822-g506a26e

[David Cole]

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  506a26e175a145d47b6af38f0b4c12b329d55724 (commit)
       via  f66e735de393c25408d9e955aa8f27c9611ac245 (commit)
      from  4ec73c5a4ac305a2faccc45862e6df18f7404cae (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=506a26e175a145d47b6af38f0b4c12b329d55724
commit 506a26e175a145d47b6af38f0b4c12b329d55724
Merge: 4ec73c5 f66e735
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 22 17:13:40 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 17:13:40 2012 -0500

    Merge topic 'target-include-directories' into next
    
    f66e735 Fix compiler warning reported on older Borland dashboard.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f66e735de393c25408d9e955aa8f27c9611ac245
commit f66e735de393c25408d9e955aa8f27c9611ac245
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 22 17:12:11 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Feb 22 17:12:11 2012 -0500

    Fix compiler warning reported on older Borland dashboard.
    
    Avoid assignment inside the if.

diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index b511f65..9296d4c 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -266,7 +266,8 @@ void cmDepends::SetIncludePathFromLanguage(const char* lang)
   includePathVar += lang;
   includePathVar += "_TARGET_INCLUDE_PATH";
   cmMakefile* mf = this->LocalGenerator->GetMakefile();
-  if(includePath = mf->GetDefinition(includePathVar.c_str()))
+  includePath = mf->GetDefinition(includePathVar.c_str());
+  if(includePath)
     {
     cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
     }
@@ -276,7 +277,8 @@ void cmDepends::SetIncludePathFromLanguage(const char* lang)
     includePathVar = "CMAKE_";
     includePathVar += lang;
     includePathVar += "_INCLUDE_PATH";
-    if(includePath = mf->GetDefinition(includePathVar.c_str()))
+    includePath = mf->GetDefinition(includePathVar.c_str());
+    if(includePath)
       {
       cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
       }

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

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


hooks/post-receive
-- 
CMake