STYLE: fix line length issues
This commit is contained in:
parent
66523061d0
commit
f7cd9f76ce
|
@ -114,7 +114,8 @@ int cmCPackOSXX11Generator::CompressFiles(const char* outFileName,
|
|||
cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
|
||||
|
||||
if (
|
||||
!this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory.c_str(),
|
||||
!this->CopyResourcePlistFile("VolumeIcon.icns",
|
||||
diskImageDirectory.c_str(),
|
||||
".VolumeIcon.icns", true ) ||
|
||||
!this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
|
||||
".DS_Store", true ) ||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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("/");
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue