[cmake-commits] martink committed cmDocumentation.cxx 1.37 1.38
cmSetPropertiesCommand.cxx 1.4 1.5 cmTarget.cxx 1.116 1.117
cmake.cxx 1.276 1.277
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Dec 8 09:27:54 EST 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12227/Source
Modified Files:
cmDocumentation.cxx cmSetPropertiesCommand.cxx cmTarget.cxx
cmake.cxx
Log Message:
COMP: fix some warnings and style issues
Index: cmDocumentation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentation.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- cmDocumentation.cxx 7 Dec 2006 14:44:45 -0000 1.37
+++ cmDocumentation.cxx 8 Dec 2006 14:27:52 -0000 1.38
@@ -580,7 +580,8 @@
}
//----------------------------------------------------------------------------
-void cmDocumentation::SetPropertiesSection(const cmDocumentationEntry* section)
+void cmDocumentation
+::SetPropertiesSection(const cmDocumentationEntry* section)
{
this->SetSection(cmDocumentationPropertiesHeader, section, 0,
this->PropertiesSection);
Index: cmSetPropertiesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSetPropertiesCommand.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmSetPropertiesCommand.cxx 7 Dec 2006 19:54:14 -0000 1.4
+++ cmSetPropertiesCommand.cxx 8 Dec 2006 14:27:52 -0000 1.5
@@ -110,8 +110,8 @@
std::string message = "Can not find target to add properties to: ";
message += scopeName;
this->SetError(message.c_str());
+ return ret;
}
- return ret;
}
break;
case cmProperty::DIRECTORY:
@@ -146,8 +146,8 @@
if (!ret)
{
this->SetError(errors.c_str());
+ return ret;
}
- return ret;
}
break;
case cmProperty::SOURCE_FILE:
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- cmake.cxx 7 Dec 2006 14:44:45 -0000 1.276
+++ cmake.cxx 8 Dec 2006 14:27:52 -0000 1.277
@@ -2835,19 +2835,14 @@
{
case cmProperty::GLOBAL:
return this->GlobalProperties.IsPropertyDefined(name);
- break;
case cmProperty::TARGET:
return this->TargetProperties.IsPropertyDefined(name);
- break;
case cmProperty::SOURCE_FILE:
return this->SourceFileProperties.IsPropertyDefined(name);
- break;
case cmProperty::DIRECTORY:
return this->DirectoryProperties.IsPropertyDefined(name);
- break;
case cmProperty::TEST:
return this->TestProperties.IsPropertyDefined(name);
- break;
}
return false;
Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- cmTarget.cxx 7 Dec 2006 14:44:45 -0000 1.116
+++ cmTarget.cxx 8 Dec 2006 14:27:52 -0000 1.117
@@ -481,7 +481,8 @@
tLocation = cmSystemTools::GetFilenamePath(tLocation);
std::string depLocation = cmSystemTools::GetFilenamePath(
std::string(fullName));
- depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str());
+ depLocation =
+ cmSystemTools::CollapseFullPath(depLocation.c_str());
tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str());
if(depLocation == tLocation)
{
More information about the Cmake-commits
mailing list