summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2010-11-11 21:02:07 (GMT)
committerAlex Neundorf <neundorf@kde.org>2010-11-11 21:02:07 (GMT)
commit7b1421b88553f4c1fa685be5bd84a5e950490317 (patch)
treefd6d5ed938a8217b49faf6f5b45cf5be45873485 /Source/cmLocalUnixMakefileGenerator3.cxx
parent3c245ab2baa159ede1957c3d6ea0d8597f8b67e7 (diff)
downloadCMake-7b1421b88553f4c1fa685be5bd84a5e950490317.zip
CMake-7b1421b88553f4c1fa685be5bd84a5e950490317.tar.gz
CMake-7b1421b88553f4c1fa685be5bd84a5e950490317.tar.bz2
Remove trailing whitespace
Alex
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx72
1 files changed, 36 insertions, 36 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f04d0a0..51566e0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -140,7 +140,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
// write the local Makefile
this->WriteLocalMakefile();
-
+
// Write the cmake file with information for this directory.
this->WriteDirectoryInformationFile();
}
@@ -149,7 +149,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
void cmLocalUnixMakefileGenerator3::GetIndividualFileTargets
(std::vector<std::string>& targets)
{
- for (std::map<cmStdString, LocalObjectInfo>::iterator lo =
+ for (std::map<cmStdString, LocalObjectInfo>::iterator lo =
this->LocalObjectFiles.begin();
lo != this->LocalObjectFiles.end(); ++lo)
{
@@ -188,10 +188,10 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
{
ruleFileStream.SetCopyIfDifferent(true);
}
-
+
// write the all rules
this->WriteLocalAllRules(ruleFileStream);
-
+
// only write local targets unless at the top Keep track of targets already
// listed.
std::set<cmStdString> emittedTargets;
@@ -203,7 +203,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
}
else
{
- cmGlobalUnixMakefileGenerator3 *gg =
+ cmGlobalUnixMakefileGenerator3 *gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
gg->WriteConvenienceRules(ruleFileStream,emittedTargets);
}
@@ -215,7 +215,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
// now write out the object rules
// for each object file name
- for (std::map<cmStdString, LocalObjectInfo>::iterator lo =
+ for (std::map<cmStdString, LocalObjectInfo>::iterator lo =
this->LocalObjectFiles.begin();
lo != this->LocalObjectFiles.end(); ++lo)
{
@@ -261,7 +261,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
// add a help target as long as there isn;t a real target named help
if(emittedTargets.insert("help").second)
{
- cmGlobalUnixMakefileGenerator3 *gg =
+ cmGlobalUnixMakefileGenerator3 *gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
gg->WriteHelpRule(ruleFileStream,this);
}
@@ -353,7 +353,7 @@ void cmLocalUnixMakefileGenerator3
localName += "/rule";
commands.clear();
depends.clear();
-
+
// Build the target for this pass.
std::string makefile2 = cmake::GetCMakeFilesDirectoryPostSlash();
makefile2 += "Makefile2";
@@ -364,7 +364,7 @@ void cmLocalUnixMakefileGenerator3
cmLocalGenerator::START_OUTPUT);
this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
localName.c_str(), depends, commands, true);
-
+
// Add a target with the canonical name (no prefix, suffix or path).
if(localName != t->second.GetName())
{
@@ -378,7 +378,7 @@ void cmLocalUnixMakefileGenerator3
std::string makefileName = this->GetRelativeTargetDirectory(t->second);
makefileName += "/build.make";
// make sure the makefile name is suitable for a makefile
- std::string makeTargetName =
+ std::string makeTargetName =
this->GetRelativeTargetDirectory(t->second);
makeTargetName += "/build";
localName = t->second.GetName();
@@ -647,7 +647,7 @@ cmLocalUnixMakefileGenerator3
makefileStream
<< "# The CMake executable.\n"
<< "CMAKE_COMMAND = "
- << this->Convert(cmakecommand.c_str(), FULL, SHELL).c_str()
+ << this->Convert(cmakecommand.c_str(), FULL, SHELL).c_str()
<< "\n"
<< "\n";
makefileStream
@@ -656,7 +656,7 @@ cmLocalUnixMakefileGenerator3
<< this->Convert(cmakecommand.c_str(),FULL,SHELL).c_str()
<< " -E remove -f\n"
<< "\n";
-
+
if(const char* edit_cmd =
this->Makefile->GetDefinition("CMAKE_EDIT_COMMAND"))
{
@@ -722,7 +722,7 @@ cmLocalUnixMakefileGenerator3
// "VERBOSE=1" to be added as a make variable which will change the
// name of this special target. This gives a make-time choice to
// the user.
- if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
+ if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
|| (gg->GetForceVerboseMakefiles()))
{
makefileStream
@@ -872,7 +872,7 @@ cmLocalUnixMakefileGenerator3
{
// Add a dependency on the rule file itself unless an option to skip
// it is specifically enabled by the user or project.
- const char* nodep =
+ const char* nodep =
this->Makefile->GetDefinition("CMAKE_SKIP_RULE_DEPENDENCY");
if(!nodep || cmSystemTools::IsOff(nodep))
{
@@ -969,7 +969,7 @@ cmLocalUnixMakefileGenerator3
{
// Build the command line in a single string.
const cmCustomCommandLine& commandLine = *cl;
- std::string cmd = GetRealLocation(commandLine[0].c_str(),
+ std::string cmd = GetRealLocation(commandLine[0].c_str(),
this->ConfigurationName.c_str());
if (cmd.size())
{
@@ -1283,7 +1283,7 @@ cmLocalUnixMakefileGenerator3
// see if the variable has been defined before and return
// the modified version of the variable
- std::map<cmStdString, cmStdString>::iterator i =
+ std::map<cmStdString, cmStdString>::iterator i =
this->MakeVariableMap.find(unmodified);
if(i != this->MakeVariableMap.end())
{
@@ -1404,7 +1404,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
dirInfoFile += "/CMakeDirectoryInformation.cmake";
{
int result;
- if(!ftc->FileTimeCompare(internalDependFile.c_str(),
+ if(!ftc->FileTimeCompare(internalDependFile.c_str(),
dirInfoFile.c_str(), &result) || result < 0)
{
if(verbose)
@@ -1418,7 +1418,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
needRescanDirInfo = true;
}
}
-
+
// Check the implicit dependencies to see if they are up to date.
// The build.make file may have explicit dependencies for the object
// files but these will not affect the scanning process so they need
@@ -1433,11 +1433,11 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
// cmDependsC::Check() fills the vector validDependencies() with the
// dependencies for those files where they are still valid, i.e. neither
// the files themselves nor any files they depend on have changed.
- // We don't do that if the CMakeDirectoryInformation.cmake file has
+ // We don't do that if the CMakeDirectoryInformation.cmake file has
// changed, because then potentially all dependencies have changed.
// This information is given later on to cmDependsC, which then only
// rescans the files where it did not get valid dependencies via this
- // dependency vector. This means that in the normal case, when only
+ // dependency vector. This means that in the normal case, when only
// few or one file have been edited, then also only this one file is
// actually scanned again, instead of all files for this target.
needRescanDependencies = !checker.Check(dependFile.c_str(),
@@ -1485,7 +1485,7 @@ cmLocalUnixMakefileGenerator3
{
haveDirectoryInfo = true;
}
-
+
// Lookup useful directory information.
if(haveDirectoryInfo)
{
@@ -1545,11 +1545,11 @@ cmLocalUnixMakefileGenerator3
this->WriteDisclaimer(ruleFileStream);
this->WriteDisclaimer(internalRuleFileStream);
- // for each language we need to scan, scan it
+ // for each language we need to scan, scan it
const char *langStr = mf->GetSafeDefinition("CMAKE_DEPENDS_LANGUAGES");
std::vector<std::string> langs;
cmSystemTools::ExpandListArgument(langStr, langs);
- for (std::vector<std::string>::iterator li =
+ for (std::vector<std::string>::iterator li =
langs.begin(); li != langs.end(); ++li)
{
// construct the checker
@@ -1572,7 +1572,7 @@ cmLocalUnixMakefileGenerator3
scanner = new cmDependsJava();
}
#endif
-
+
if (scanner)
{
scanner->SetLocalGenerator(this);
@@ -1686,25 +1686,25 @@ void cmLocalUnixMakefileGenerator3
cmLocalUnixMakefileGenerator3::EchoGlobal);
// Global targets store their rules in pre- and post-build commands.
- this->AppendCustomDepends(depends,
+ this->AppendCustomDepends(depends,
glIt->second.GetPreBuildCommands());
- this->AppendCustomDepends(depends,
+ this->AppendCustomDepends(depends,
glIt->second.GetPostBuildCommands());
- this->AppendCustomCommands(commands,
+ this->AppendCustomCommands(commands,
glIt->second.GetPreBuildCommands(),
&glIt->second,
cmLocalGenerator::START_OUTPUT);
- this->AppendCustomCommands(commands,
+ this->AppendCustomCommands(commands,
glIt->second.GetPostBuildCommands(),
&glIt->second,
cmLocalGenerator::START_OUTPUT);
std::string targetName = glIt->second.GetName();
- this->WriteMakeRule(ruleFileStream, targetString.c_str(),
+ this->WriteMakeRule(ruleFileStream, targetString.c_str(),
targetName.c_str(), depends, commands, true);
// Provide a "/fast" version of the target.
depends.clear();
- if((targetName == "install")
+ if((targetName == "install")
|| (targetName == "install_local")
|| (targetName == "install_strip"))
{
@@ -1738,7 +1738,7 @@ void cmLocalUnixMakefileGenerator3
progressDir += cmake::GetCMakeFilesDirectory();
{
cmOStringStream progCmd;
- progCmd <<
+ progCmd <<
"$(CMAKE_COMMAND) -E cmake_progress_start ";
progCmd << this->Convert(progressDir.c_str(),
cmLocalGenerator::FULL,
@@ -1833,8 +1833,8 @@ void cmLocalUnixMakefileGenerator3
this->CreateCDCommand(commands,
this->Makefile->GetHomeOutputDirectory(),
cmLocalGenerator::START_OUTPUT);
- this->WriteMakeRule(ruleFileStream, "clear depends",
- "depend",
+ this->WriteMakeRule(ruleFileStream, "clear depends",
+ "depend",
depends, commands, true);
}
@@ -2048,7 +2048,7 @@ cmLocalUnixMakefileGenerator3
cmd += "$(MAKE) -f ";
cmd += this->Convert(makefile,NONE,SHELL);
cmd += " ";
-
+
// Pass down verbosity level.
if(this->GetMakeSilentFlag().size())
{
@@ -2125,7 +2125,7 @@ cmLocalUnixMakefileGenerator3
std::string
cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p)
{
-
+
// Split the path into its components.
std::vector<std::string> components;
cmSystemTools::SplitPath(p, components);
@@ -2224,7 +2224,7 @@ void cmLocalUnixMakefileGenerator3
{
return;
}
-
+
if(!this->UnixCD)
{
// On Windows we must perform each step separately and then change