[Cmake-commits] CMake branch, next, updated. v2.8.7-2676-ga341fe5
Alexander Neundorf
neundorf at kde.org
Fri Feb 17 10:44:53 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a341fe5a8f14f9fbf314e7ac927795ba38ef8c13 (commit)
via 939991dbe6350eb0d9ac8983be67c776fce0baad (commit)
via ba1ea104670df8cb86728c4d0fb4ca48d45364af (commit)
from f131113d11ca69ec71f090b402fbd04a38e14c41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a341fe5a8f14f9fbf314e7ac927795ba38ef8c13
commit a341fe5a8f14f9fbf314e7ac927795ba38ef8c13
Merge: f131113 939991d
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 17 10:44:38 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 17 10:44:38 2012 -0500
Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next
939991d fix bootstrap: move while() and endwhile() into the bootstrap build
ba1ea10 strip trailing whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=939991dbe6350eb0d9ac8983be67c776fce0baad
commit 939991dbe6350eb0d9ac8983be67c776fce0baad
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 17 16:42:06 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Feb 17 16:42:06 2012 +0100
fix bootstrap: move while() and endwhile() into the bootstrap build
Alex
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
index cb5dc4c..9097a74 100644
--- a/Source/cmBootstrapCommands.cxx
+++ b/Source/cmBootstrapCommands.cxx
@@ -38,6 +38,7 @@
#include "cmEndFunctionCommand.cxx"
#include "cmEndIfCommand.cxx"
#include "cmEndMacroCommand.cxx"
+#include "cmEndWhileCommand.cxx"
#include "cmExecProgramCommand.cxx"
#include "cmExecuteProcessCommand.cxx"
#include "cmExternalMakefileProjectGenerator.cxx"
@@ -91,6 +92,7 @@
#include "cmTryCompileCommand.cxx"
#include "cmTryRunCommand.cxx"
#include "cmUnsetCommand.cxx"
+#include "cmWhileCommand.cxx"
void GetBootstrapCommands(std::list<cmCommand*>& commands)
{
@@ -116,6 +118,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmEndFunctionCommand);
commands.push_back(new cmEndIfCommand);
commands.push_back(new cmEndMacroCommand);
+ commands.push_back(new cmEndWhileCommand);
commands.push_back(new cmExecProgramCommand);
commands.push_back(new cmExecuteProcessCommand);
commands.push_back(new cmFileCommand);
@@ -164,4 +167,5 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmTryCompileCommand);
commands.push_back(new cmTryRunCommand);
commands.push_back(new cmUnsetCommand);
+ commands.push_back(new cmWhileCommand);
}
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index bb1e4e2..49ed967 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -14,7 +14,6 @@
#include "cmAuxSourceDirectoryCommand.cxx"
#include "cmBuildNameCommand.cxx"
#include "cmElseIfCommand.cxx"
-#include "cmEndWhileCommand.cxx"
#include "cmExportCommand.cxx"
#include "cmExportLibraryDependencies.cxx"
#include "cmFLTKWrapUICommand.cxx"
@@ -34,7 +33,6 @@
#include "cmVariableRequiresCommand.cxx"
#include "cmVariableWatchCommand.cxx"
-#include "cmWhileCommand.cxx"
#include "cmWriteFileCommand.cxx"
// This one must be last because it includes windows.h and
@@ -53,7 +51,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmAuxSourceDirectoryCommand);
commands.push_back(new cmBuildNameCommand);
commands.push_back(new cmElseIfCommand);
- commands.push_back(new cmEndWhileCommand);
commands.push_back(new cmExportCommand);
commands.push_back(new cmExportLibraryDependenciesCommand);
commands.push_back(new cmFLTKWrapUICommand);
@@ -73,7 +70,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmUtilitySourceCommand);
commands.push_back(new cmVariableRequiresCommand);
commands.push_back(new cmVariableWatchCommand);
- commands.push_back(new cmWhileCommand);
commands.push_back(new cmWriteFileCommand);
#endif
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba1ea104670df8cb86728c4d0fb4ca48d45364af
commit ba1ea104670df8cb86728c4d0fb4ca48d45364af
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 17 16:41:14 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Feb 17 16:41:14 2012 +0100
strip trailing whitespace
Alex
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
index 554f452..cb5dc4c 100644
--- a/Source/cmBootstrapCommands.cxx
+++ b/Source/cmBootstrapCommands.cxx
@@ -12,7 +12,7 @@
// This file is used to compile all the commands
// that CMake knows about at compile time.
// This is sort of a boot strapping approach since you would
-// like to have CMake to build CMake.
+// like to have CMake to build CMake.
#include "cmCommands.h"
#include "cmAddCustomCommandCommand.cxx"
#include "cmAddCustomTargetCommand.cxx"
@@ -111,7 +111,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmDefinePropertyCommand);
commands.push_back(new cmElseCommand);
commands.push_back(new cmEnableLanguageCommand);
- commands.push_back(new cmEnableTestingCommand);
+ commands.push_back(new cmEnableTestingCommand);
commands.push_back(new cmEndForEachCommand);
commands.push_back(new cmEndFunctionCommand);
commands.push_back(new cmEndIfCommand);
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 7eafda2..4000345 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -25,7 +25,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
else if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endwhile"))
{
// if this is the endwhile for this while loop then execute
- if (!this->Depth)
+ if (!this->Depth)
{
// Remove the function blocker for this scope or bail.
cmsys::auto_ptr<cmFunctionBlocker>
@@ -33,16 +33,16 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
if(!fb.get()) { return false; }
std::string errorString;
-
+
std::vector<std::string> expandedArguments;
mf.ExpandArguments(this->Args, expandedArguments);
cmake::MessageType messageType;
- bool isTrue =
+ bool isTrue =
cmIfCommand::IsTrue(expandedArguments,errorString,
&mf, messageType);
while (isTrue)
- {
+ {
if (errorString.size())
{
std::string err = "had incorrect arguments: ";
@@ -86,7 +86,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
}
expandedArguments.clear();
mf.ExpandArguments(this->Args, expandedArguments);
- isTrue =
+ isTrue =
cmIfCommand::IsTrue(expandedArguments,errorString,
&mf, messageType);
}
@@ -101,7 +101,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
// record the command
this->Functions.push_back(lff);
-
+
// always return true
return true;
}
@@ -123,7 +123,7 @@ ShouldRemove(const cmListFileFunction& lff, cmMakefile& )
}
bool cmWhileCommand
-::InvokeInitialPass(const std::vector<cmListFileArgument>& args,
+::InvokeInitialPass(const std::vector<cmListFileArgument>& args,
cmExecutionStatus &)
{
if(args.size() < 1)
@@ -131,12 +131,12 @@ bool cmWhileCommand
this->SetError("called with incorrect number of arguments");
return false;
}
-
+
// create a function blocker
cmWhileFunctionBlocker *f = new cmWhileFunctionBlocker();
f->Args = args;
this->Makefile->AddFunctionBlocker(f);
-
+
return true;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmBootstrapCommands.cxx | 4 ++++
Source/cmCommands.cxx | 4 ----
Source/cmWhileCommand.cxx | 18 +++++++++---------
3 files changed, 13 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list