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

COMP: fix some warnings and style issues

This commit is contained in:
Ken Martin 2006-12-08 09:27:52 -05:00
parent 5ccd5a4a5b
commit 1dd5db0235
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmDocumentation.cxx
View File

@ -580,7 +580,8 @@ void cmDocumentation::SetCommandsSection(const cmDocumentationEntry* section)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmDocumentation::SetPropertiesSection(const cmDocumentationEntry* section) void cmDocumentation
::SetPropertiesSection(const cmDocumentationEntry* section)
{ {
this->SetSection(cmDocumentationPropertiesHeader, section, 0, this->SetSection(cmDocumentationPropertiesHeader, section, 0,
this->PropertiesSection); this->PropertiesSection);

4
Source/cmSetPropertiesCommand.cxx
View File

@ -110,9 +110,9 @@ bool cmSetPropertiesCommand::InitialPass(
std::string message = "Can not find target to add properties to: "; std::string message = "Can not find target to add properties to: ";
message += scopeName; message += scopeName;
this->SetError(message.c_str()); this->SetError(message.c_str());
}
return ret; return ret;
} }
}
break; break;
case cmProperty::DIRECTORY: case cmProperty::DIRECTORY:
{ {
@ -146,9 +146,9 @@ bool cmSetPropertiesCommand::InitialPass(
if (!ret) if (!ret)
{ {
this->SetError(errors.c_str()); this->SetError(errors.c_str());
}
return ret; return ret;
} }
}
break; break;
case cmProperty::SOURCE_FILE: case cmProperty::SOURCE_FILE:
// not implemented yet // not implemented yet

3
Source/cmTarget.cxx
View File

@ -481,7 +481,8 @@ void cmTarget::TraceVSDependencies(std::string projFile,
tLocation = cmSystemTools::GetFilenamePath(tLocation); tLocation = cmSystemTools::GetFilenamePath(tLocation);
std::string depLocation = cmSystemTools::GetFilenamePath( std::string depLocation = cmSystemTools::GetFilenamePath(
std::string(fullName)); std::string(fullName));
depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str()); depLocation =
cmSystemTools::CollapseFullPath(depLocation.c_str());
tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str()); tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str());
if(depLocation == tLocation) if(depLocation == tLocation)
{ {

5
Source/cmake.cxx
View File

@ -2835,19 +2835,14 @@ bool cmake::IsPropertyDefined(const char *name, cmProperty::ScopeType scope)
{ {
case cmProperty::GLOBAL: case cmProperty::GLOBAL:
return this->GlobalProperties.IsPropertyDefined(name); return this->GlobalProperties.IsPropertyDefined(name);
break;
case cmProperty::TARGET: case cmProperty::TARGET:
return this->TargetProperties.IsPropertyDefined(name); return this->TargetProperties.IsPropertyDefined(name);
break;
case cmProperty::SOURCE_FILE: case cmProperty::SOURCE_FILE:
return this->SourceFileProperties.IsPropertyDefined(name); return this->SourceFileProperties.IsPropertyDefined(name);
break;
case cmProperty::DIRECTORY: case cmProperty::DIRECTORY:
return this->DirectoryProperties.IsPropertyDefined(name); return this->DirectoryProperties.IsPropertyDefined(name);
break;
case cmProperty::TEST: case cmProperty::TEST:
return this->TestProperties.IsPropertyDefined(name); return this->TestProperties.IsPropertyDefined(name);
break;
} }
return false; return false;