[cmake-commits] alex committed cmFileCommand.cxx 1.79 1.80
cmFindBase.cxx 1.20 1.21 cmFindBase.h 1.10 1.11
cmInstallTargetGenerator.cxx 1.31 1.32 cmTryRunCommand.cxx 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri May 18 08:49:08 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv16782
Modified Files:
cmFileCommand.cxx cmFindBase.cxx cmFindBase.h
cmInstallTargetGenerator.cxx cmTryRunCommand.cxx
Log Message:
STYLE: fix line lengths
Alex
Index: cmFindBase.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmFindBase.h 17 May 2007 17:20:44 -0000 1.10
+++ cmFindBase.h 18 May 2007 12:49:06 -0000 1.11
@@ -39,7 +39,9 @@
virtual const char* GetFullDocumentation()
{return this->GenericDocumentation.c_str();}
- enum RootPathMode { RootPathModeBoth, RootPathModeOnlyRootPath, RootPathModeNoRootPath };
+ enum RootPathMode { RootPathModeBoth,
+ RootPathModeOnlyRootPath,
+ RootPathModeNoRootPath };
protected:
void PrintFindStuff();
Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmFindBase.cxx 17 May 2007 17:20:44 -0000 1.20
+++ cmFindBase.cxx 18 May 2007 12:49:06 -0000 1.21
@@ -252,10 +252,10 @@
}
this->AlreadyInCache = false;
-
std::string findRootPathVar = "CMAKE_FIND_ROOT_PATH_MODE_";
findRootPathVar += this->CMakePathName;
- std::string rootPathMode = this->Makefile->GetSafeDefinition(findRootPathVar.c_str());
+ std::string rootPathMode =
+ this->Makefile->GetSafeDefinition(findRootPathVar.c_str());
if (rootPathMode=="NEVER")
{
this->FindRootPathMode = RootPathModeNoRootPath;
@@ -496,7 +496,7 @@
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))
{
return;
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cmInstallTargetGenerator.cxx 17 May 2007 21:43:32 -0000 1.31
+++ cmInstallTargetGenerator.cxx 18 May 2007 12:49:06 -0000 1.32
@@ -459,7 +459,7 @@
}
void cmInstallTargetGenerator::AddStripRule(std::ostream& os,
- const std::string& destinationFilename)
+ const std::string& destinationFilename)
{
// Don't handle OSX Bundles.
@@ -482,8 +482,8 @@
}
void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
- cmTarget::TargetType type,
- const std::string& destinationFilename)
+ cmTarget::TargetType type,
+ const std::string& destinationFilename)
{
// Static libraries need ranlib on this platform.
if(type != cmTarget::STATIC_LIBRARY)
@@ -498,7 +498,8 @@
return;
}
- std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB");
+ std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition(
+ "CMAKE_RANLIB");
if (!ranlib.size())
{
return;
Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- cmFileCommand.cxx 17 May 2007 17:20:44 -0000 1.79
+++ cmFileCommand.cxx 18 May 2007 12:49:06 -0000 1.80
@@ -1088,7 +1088,8 @@
}
//----------------------------------------------------------------------------
-void cmFileCommand::GetTargetTypeFromString(const std::string& stype, int& itype) const
+void cmFileCommand
+::GetTargetTypeFromString(const std::string& stype, int& itype) const
{
if ( stype == "EXECUTABLE" )
{
@@ -1118,7 +1119,8 @@
//----------------------------------------------------------------------------
-bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer, std::string& destination)
+bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer,
+ std::string& destination)
{
if ( destination.size() < 2 )
{
@@ -1240,15 +1242,15 @@
//----------------------------------------------------------------------------
bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
- cmFileInstaller& installer,
- std::set<cmStdString>& components,
- std::set<cmStdString>& configurations,
- std::map<cmStdString, const char*>& properties,
- int& itype,
- std::string& rename,
- std::string& destination,
- std::vector<std::string>& files,
- bool& optional)
+ cmFileInstaller& installer,
+ std::set<cmStdString>& components,
+ std::set<cmStdString>& configurations,
+ std::map<cmStdString, const char*>& properties,
+ int& itype,
+ std::string& rename,
+ std::string& destination,
+ std::vector<std::string>& files,
+ bool& optional)
{
std::string stype = "FILES";
bool doing_files = false;
@@ -1554,7 +1556,8 @@
}
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;
}
}
Index: cmTryRunCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryRunCommand.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cmTryRunCommand.cxx 17 May 2007 17:20:44 -0000 1.24
+++ cmTryRunCommand.cxx 18 May 2007 12:49:06 -0000 1.25
@@ -82,7 +82,8 @@
{
int retVal = -1;
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::vector<std::string> attemptedPaths;
command1 += "/cmTryCompileExec";
More information about the Cmake-commits
mailing list