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

STYLE: fix line length issues

This commit is contained in:
Bill Hoffman 2007-02-17 08:46:25 -05:00
parent 66523061d0
commit f7cd9f76ce
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CPack/cmCPackOSXX11Generator.cxx
View File

@ -114,8 +114,9 @@ int cmCPackOSXX11Generator::CompressFiles(const char* outFileName,
cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str()); cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
if ( if (
!this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory.c_str(), !this->CopyResourcePlistFile("VolumeIcon.icns",
".VolumeIcon.icns", true ) || diskImageDirectory.c_str(),
".VolumeIcon.icns", true ) ||
!this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(), !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
".DS_Store", true ) || ".DS_Store", true ) ||
!this->CopyResourcePlistFile("background.png", !this->CopyResourcePlistFile("background.png",

3
Source/cmLocalGenerator.cxx
View File

@ -2404,7 +2404,8 @@ cmLocalGenerator::GetTargetObjectFileDirectories(cmTarget* ,
std::vector<std::string>& std::vector<std::string>&
) )
{ {
cmSystemTools::Error("GetTargetObjectFileDirectories called on cmLocalGenerator"); cmSystemTools::Error("GetTargetObjectFileDirectories"
" called on cmLocalGenerator");
} }
std::string cmLocalGenerator::GetSourceObjectName(cmSourceFile& sf) std::string cmLocalGenerator::GetSourceObjectName(cmSourceFile& sf)

3
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1965,7 +1965,8 @@ GetTargetObjectFileDirectories(cmTarget* target,
// return the source name for the object file // 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 ret = sf.GetSourceName();
std::string::size_type pos = ret.find("/"); std::string::size_type pos = ret.find("/");

3
Source/cmLocalXCodeGenerator.cxx
View File

@ -18,7 +18,8 @@ GetTargetObjectFileDirectories(cmTarget* target,
std::vector<std::string>& std::vector<std::string>&
dirs) dirs)
{ {
cmGlobalXCodeGenerator* g = (cmGlobalXCodeGenerator*)this->GetGlobalGenerator(); cmGlobalXCodeGenerator* g =
(cmGlobalXCodeGenerator*)this->GetGlobalGenerator();
g->SetCurrentLocalGenerator(this); g->SetCurrentLocalGenerator(this);
g->GetTargetObjectFileDirectories(target, g->GetTargetObjectFileDirectories(target,
dirs); dirs);

3
Source/cmTarget.cxx
View File

@ -1195,7 +1195,8 @@ void cmTarget::ComputeObjectFiles()
{ {
cmSourceFile* sf = *s; cmSourceFile* sf = *s;
const char* lang = this->Makefile->GetLocalGenerator()-> const char* lang = this->Makefile->GetLocalGenerator()->
GetGlobalGenerator()->GetLanguageFromExtension(sf->GetSourceExtension().c_str()); GetGlobalGenerator()->
GetLanguageFromExtension(sf->GetSourceExtension().c_str());
std::string lookupObj = objExtensionLookup1 + lang; std::string lookupObj = objExtensionLookup1 + lang;
lookupObj += objExtensionLookup2; lookupObj += objExtensionLookup2;
const char* obj = this->Makefile->GetDefinition(lookupObj.c_str()); const char* obj = this->Makefile->GetDefinition(lookupObj.c_str());