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

STYLE: fix line lengths

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-05-18 08:49:06 -04:00
parent 42a272428b
commit aee311a89d
5 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmFileCommand.cxx
View File

@ -1088,7 +1088,8 @@ void cmFileCommand::HandleInstallPermissions(cmFileInstaller& installer,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmFileCommand::GetTargetTypeFromString(const std::string& stype, int& itype) const void cmFileCommand
::GetTargetTypeFromString(const std::string& stype, int& itype) const
{ {
if ( stype == "EXECUTABLE" ) if ( stype == "EXECUTABLE" )
{ {
@ -1118,7 +1119,8 @@ void cmFileCommand::GetTargetTypeFromString(const std::string& stype, int& itype
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer, std::string& destination) bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer,
std::string& destination)
{ {
if ( destination.size() < 2 ) if ( destination.size() < 2 )
{ {
@ -1240,15 +1242,15 @@ bool cmFileCommand::HandleInstallCommand(std::vector<std::string> const& args)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args, bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
cmFileInstaller& installer, cmFileInstaller& installer,
std::set<cmStdString>& components, std::set<cmStdString>& components,
std::set<cmStdString>& configurations, std::set<cmStdString>& configurations,
std::map<cmStdString, const char*>& properties, std::map<cmStdString, const char*>& properties,
int& itype, int& itype,
std::string& rename, std::string& rename,
std::string& destination, std::string& destination,
std::vector<std::string>& files, std::vector<std::string>& files,
bool& optional) bool& optional)
{ {
std::string stype = "FILES"; std::string stype = "FILES";
bool doing_files = false; bool doing_files = false;
@ -1554,7 +1556,8 @@ bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
} }
if(files.size() > 1) if(files.size() > 1)
{ {
this->SetError("INSTALL option RENAME may be used only with one file."); this->SetError("INSTALL option RENAME may be used only with "
"one file.");
return false; return false;
} }
} }

6
Source/cmFindBase.cxx
View File

@ -252,10 +252,10 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
} }
this->AlreadyInCache = false; this->AlreadyInCache = false;
std::string findRootPathVar = "CMAKE_FIND_ROOT_PATH_MODE_"; std::string findRootPathVar = "CMAKE_FIND_ROOT_PATH_MODE_";
findRootPathVar += this->CMakePathName; findRootPathVar += this->CMakePathName;
std::string rootPathMode = this->Makefile->GetSafeDefinition(findRootPathVar.c_str()); std::string rootPathMode =
this->Makefile->GetSafeDefinition(findRootPathVar.c_str());
if (rootPathMode=="NEVER") if (rootPathMode=="NEVER")
{ {
this->FindRootPathMode = RootPathModeNoRootPath; this->FindRootPathMode = RootPathModeNoRootPath;
@ -496,7 +496,7 @@ void cmFindBase::HandleCMakeFindRootPath()
return; return;
} }
const char* rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH"); const char* rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
if ((rootPath == 0) || (strlen(rootPath) == 0)) if ((rootPath == 0) || (strlen(rootPath) == 0))
{ {
return; return;

4
Source/cmFindBase.h
View File

@ -39,7 +39,9 @@ public:
virtual const char* GetFullDocumentation() virtual const char* GetFullDocumentation()
{return this->GenericDocumentation.c_str();} {return this->GenericDocumentation.c_str();}
enum RootPathMode { RootPathModeBoth, RootPathModeOnlyRootPath, RootPathModeNoRootPath }; enum RootPathMode { RootPathModeBoth,
RootPathModeOnlyRootPath,
RootPathModeNoRootPath };
protected: protected:
void PrintFindStuff(); void PrintFindStuff();

9
Source/cmInstallTargetGenerator.cxx
View File

@ -459,7 +459,7 @@ void cmInstallTargetGenerator
} }
void cmInstallTargetGenerator::AddStripRule(std::ostream& os, void cmInstallTargetGenerator::AddStripRule(std::ostream& os,
const std::string& destinationFilename) const std::string& destinationFilename)
{ {
// Don't handle OSX Bundles. // Don't handle OSX Bundles.
@ -482,8 +482,8 @@ void cmInstallTargetGenerator::AddStripRule(std::ostream& os,
} }
void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os, void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
cmTarget::TargetType type, cmTarget::TargetType type,
const std::string& destinationFilename) const std::string& destinationFilename)
{ {
// Static libraries need ranlib on this platform. // Static libraries need ranlib on this platform.
if(type != cmTarget::STATIC_LIBRARY) if(type != cmTarget::STATIC_LIBRARY)
@ -498,7 +498,8 @@ void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
return; return;
} }
std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB"); std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition(
"CMAKE_RANLIB");
if (!ranlib.size()) if (!ranlib.size())
{ {
return; return;

3
Source/cmTryRunCommand.cxx
View File

@ -82,7 +82,8 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
{ {
int retVal = -1; int retVal = -1;
std::string output; std::string output;
std::string executableSuffix=this->Makefile->GetDefinition("CMAKE_EXECUTABLE_SUFFIX"); std::string executableSuffix=this->Makefile->GetDefinition(
"CMAKE_EXECUTABLE_SUFFIX");
std::string command1 = binaryDirectory; std::string command1 = binaryDirectory;
std::vector<std::string> attemptedPaths; std::vector<std::string> attemptedPaths;
command1 += "/cmTryCompileExec"; command1 += "/cmTryCompileExec";