kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler error reported on older Borland dashboard.

Browse Source 
Declare variable only once at a scope appropriate for both uses.
This commit is contained in:
David Cole 2012-02-22 16:38:17 -05:00
parent 8233636dbe
commit d90eed445f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmDepends.cxx
View File

@ -261,11 +261,12 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
void cmDepends::SetIncludePathFromLanguage(const char* lang) void cmDepends::SetIncludePathFromLanguage(const char* lang)
{ {
// Look for the new per "TARGET_" variant first: // Look for the new per "TARGET_" variant first:
const char * includePath = 0;
std::string includePathVar = "CMAKE_"; std::string includePathVar = "CMAKE_";
includePathVar += lang; includePathVar += lang;
includePathVar += "_TARGET_INCLUDE_PATH"; includePathVar += "_TARGET_INCLUDE_PATH";
cmMakefile* mf = this->LocalGenerator->GetMakefile(); 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); cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
} }
@ -275,7 +276,7 @@ void cmDepends::SetIncludePathFromLanguage(const char* lang)
includePathVar = "CMAKE_"; includePathVar = "CMAKE_";
includePathVar += lang; includePathVar += lang;
includePathVar += "_INCLUDE_PATH"; includePathVar += "_INCLUDE_PATH";
if(const char* includePath = mf->GetDefinition(includePathVar.c_str())) if(includePath = mf->GetDefinition(includePathVar.c_str()))
{ {
cmSystemTools::ExpandListArgument(includePath, this->IncludePath); cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
} }