diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-17 13:46:25 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-17 13:46:25 (GMT) |
| commit | f7cd9f76ce5f49183b519007e8e0bb20f2ae664e (patch) | |
| tree | 09f62c1f964baff754b20a412abf22693582da9a /Source | |
| parent | 66523061d0d35b80dcc4a5c19d43a93cb455e58b (diff) | |
| download | CMake-f7cd9f76ce5f49183b519007e8e0bb20f2ae664e.zip CMake-f7cd9f76ce5f49183b519007e8e0bb20f2ae664e.tar.gz CMake-f7cd9f76ce5f49183b519007e8e0bb20f2ae664e.tar.bz2 | |
STYLE: fix line length issues
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLocalXCodeGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 0a63dd3..3bc9d0c 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -114,8 +114,9 @@ int cmCPackOSXX11Generator::CompressFiles(const char* outFileName, cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str()); if ( - !this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory.c_str(), - ".VolumeIcon.icns", true ) || + !this->CopyResourcePlistFile("VolumeIcon.icns", + diskImageDirectory.c_str(), + ".VolumeIcon.icns", true ) || !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(), ".DS_Store", true ) || !this->CopyResourcePlistFile("background.png", diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3e07a24..4ab899a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2404,7 +2404,8 @@ cmLocalGenerator::GetTargetObjectFileDirectories(cmTarget* , std::vector<std::string>& ) { - cmSystemTools::Error("GetTargetObjectFileDirectories called on cmLocalGenerator"); + cmSystemTools::Error("GetTargetObjectFileDirectories" + " called on cmLocalGenerator"); } std::string cmLocalGenerator::GetSourceObjectName(cmSourceFile& sf) diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index ff72152..b69d9bb 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1965,7 +1965,8 @@ GetTargetObjectFileDirectories(cmTarget* target, // return the source name for the object file -std::string cmLocalVisualStudio7Generator::GetSourceObjectName(cmSourceFile& sf ) +std::string +cmLocalVisualStudio7Generator::GetSourceObjectName(cmSourceFile& sf ) { std::string ret = sf.GetSourceName(); std::string::size_type pos = ret.find("/"); diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx index 311735d..c55a0ed 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -18,7 +18,8 @@ GetTargetObjectFileDirectories(cmTarget* target, std::vector<std::string>& dirs) { - cmGlobalXCodeGenerator* g = (cmGlobalXCodeGenerator*)this->GetGlobalGenerator(); + cmGlobalXCodeGenerator* g = + (cmGlobalXCodeGenerator*)this->GetGlobalGenerator(); g->SetCurrentLocalGenerator(this); g->GetTargetObjectFileDirectories(target, dirs); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 5349dff..3bd0d30 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1195,7 +1195,8 @@ void cmTarget::ComputeObjectFiles() { cmSourceFile* sf = *s; const char* lang = this->Makefile->GetLocalGenerator()-> - GetGlobalGenerator()->GetLanguageFromExtension(sf->GetSourceExtension().c_str()); + GetGlobalGenerator()-> + GetLanguageFromExtension(sf->GetSourceExtension().c_str()); std::string lookupObj = objExtensionLookup1 + lang; lookupObj += objExtensionLookup2; const char* obj = this->Makefile->GetDefinition(lookupObj.c_str()); |