diff options
| -rw-r--r-- | Source/cmDocumentation.cxx | 3 | ||||
| -rw-r--r-- | Source/cmSetPropertiesCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 3 | ||||
| -rw-r--r-- | Source/cmake.cxx | 5 |
4 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index 53b1342..840b5c0 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -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->PropertiesSection); diff --git a/Source/cmSetPropertiesCommand.cxx b/Source/cmSetPropertiesCommand.cxx index d69dddd..8024c6a 100644 --- a/Source/cmSetPropertiesCommand.cxx +++ b/Source/cmSetPropertiesCommand.cxx @@ -110,8 +110,8 @@ bool cmSetPropertiesCommand::InitialPass( 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 @@ bool cmSetPropertiesCommand::InitialPass( if (!ret) { this->SetError(errors.c_str()); + return ret; } - return ret; } break; case cmProperty::SOURCE_FILE: diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 857cdba..31cd078 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -481,7 +481,8 @@ void cmTarget::TraceVSDependencies(std::string projFile, 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) { diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 2d813f5..ba8334e 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2835,19 +2835,14 @@ bool cmake::IsPropertyDefined(const char *name, cmProperty::ScopeType scope) { 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; |