[Cmake-commits] CMake branch, next, updated. v2.8.7-2820-g4ec73c5

David Cole david.cole at kitware.com
Wed Feb 22 16:43:28 EST 2012


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  4ec73c5a4ac305a2faccc45862e6df18f7404cae (commit)
       via  d90eed445fe6cfe4d5998813d4cb24151f8d8f9d (commit)
      from  17e0e47fc2726ae19b44d13d3e74e9617e8906f7 (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=4ec73c5a4ac305a2faccc45862e6df18f7404cae
commit 4ec73c5a4ac305a2faccc45862e6df18f7404cae
Merge: 17e0e47 d90eed4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 22 16:43:26 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 16:43:26 2012 -0500

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


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

    Fix compiler error reported on older Borland dashboard.
    
    Declare variable only once at a scope appropriate for both uses.

diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 94ff471..b511f65 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -261,11 +261,12 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
 void cmDepends::SetIncludePathFromLanguage(const char* lang)
 {
   // Look for the new per "TARGET_" variant first:
+  const char * includePath = 0;
   std::string includePathVar = "CMAKE_";
   includePathVar += lang;
   includePathVar += "_TARGET_INCLUDE_PATH";
   cmMakefile* mf = this->LocalGenerator->GetMakefile();
-  if(const char* includePath = mf->GetDefinition(includePathVar.c_str()))
+  if(includePath = mf->GetDefinition(includePathVar.c_str()))
     {
     cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
     }
@@ -275,7 +276,7 @@ void cmDepends::SetIncludePathFromLanguage(const char* lang)
     includePathVar = "CMAKE_";
     includePathVar += lang;
     includePathVar += "_INCLUDE_PATH";
-    if(const char* includePath = mf->GetDefinition(includePathVar.c_str()))
+    if(includePath = mf->GetDefinition(includePathVar.c_str()))
       {
       cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
       }

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list