reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 20:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed if statements inside a foreach

Browse Source
This commit is contained in:
Ken Martin 2002-07-17 10:48:39 -04:00
parent 3d3caacf9e
commit fcc410de44
6 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmForEachCommand.cxx
View File

@ -21,10 +21,16 @@ bool cmForEachFunctionBlocker::
IsFunctionBlocked(const char *name, const std::vector<std::string> &args,
cmMakefile &mf)
{
// prevent recusion and don't let this blobker blobk its own commands
if (m_Executing)
{
return false;
}
// at end of for each execute recorded commands
if (!strcmp(name,"ENDFOREACH") && args[0] == m_Args[0])
{
m_Executing = true;
std::string variable = "${";
variable += m_Args[0];
variable += "}";
@ -90,7 +96,7 @@ bool cmForEachCommand::InitialPass(std::vector<std::string> const& argsIn)
std::vector<std::string> args;
cmSystemTools::ExpandListArguments(argsIn, args);
if(args.size() < 2 )
if(args.size() < 1)
{
this->SetError("called with incorrect number of arguments");
return false;

3
Source/cmForEachCommand.h
View File

@ -29,7 +29,7 @@
class cmForEachFunctionBlocker : public cmFunctionBlocker
{
public:
cmForEachFunctionBlocker() {}
cmForEachFunctionBlocker() {m_Executing = false;}
virtual ~cmForEachFunctionBlocker() {}
virtual bool IsFunctionBlocked(const char *name,
const std::vector<std::string> &args,
@ -44,6 +44,7 @@ public:
std::vector<std::string> m_Args;
std::vector<std::string> m_Commands;
std::vector<std::vector<std::string> > m_CommandArguments;
bool m_Executing;
};
/** \class cmForEachCommand

14
Source/cmMakefile.cxx
View File

@ -193,6 +193,12 @@ bool cmMakefile::CommandExists(const char* name) const
void cmMakefile::ExecuteCommand(std::string &name,
std::vector<std::string> const& arguments)
{
// quick return if blocked
if(this->IsFunctionBlocked(name.c_str(), arguments))
{
return;
}
// execute the command
RegisteredCommandsMap::iterator pos = m_Commands.find(name);
if(pos != m_Commands.end())
{
@ -342,12 +348,8 @@ bool cmMakefile::ReadListFile(const char* filename, const char* external)
for(size_t i =0; i < numberFunctions; ++i)
{
cmListFileFunction& curFunction = lf->m_Functions[i];
if(!this->IsFunctionBlocked(curFunction.m_Name.c_str(),
curFunction.m_Arguments))
{
this->ExecuteCommand(curFunction.m_Name,
curFunction.m_Arguments);
}
this->ExecuteCommand(curFunction.m_Name,
curFunction.m_Arguments);
}
// send scope ended to and funciton blockers

6
Tests/Complex/CMakeLists.txt
View File

@ -164,13 +164,13 @@ REMOVE(REMOVE_STRING ${removeVar1} f)
# Test an IF inside a FOREACH.
#
FOREACH(x "a")
IF(1)
IF(${x} MATCHES "a")
# Should always execute.
SET(IF_INSIDE_FOREACH_THEN_EXECUTED 1)
ELSE(1)
ELSE(${x} MATCHES "a")
# Should never execute.
SET(IF_INSIDE_FOREACH_ELSE_EXECUTED 1)
ENDIF(1)
ENDIF(${x} MATCHES "a")
ENDFOREACH(x)

6
Tests/ComplexOneConfig/CMakeLists.txt
View File

@ -164,13 +164,13 @@ REMOVE(REMOVE_STRING ${removeVar1} f)
# Test an IF inside a FOREACH.
#
FOREACH(x "a")
IF(1)
IF(${x} MATCHES "a")
# Should always execute.
SET(IF_INSIDE_FOREACH_THEN_EXECUTED 1)
ELSE(1)
ELSE(${x} MATCHES "a")
# Should never execute.
SET(IF_INSIDE_FOREACH_ELSE_EXECUTED 1)
ENDIF(1)
ENDIF(${x} MATCHES "a")
ENDFOREACH(x)

6
Tests/ComplexRelativePaths/CMakeLists.txt
View File

@ -164,13 +164,13 @@ REMOVE(REMOVE_STRING ${removeVar1} f)
# Test an IF inside a FOREACH.
#
FOREACH(x "a")
IF(1)
IF(${x} MATCHES "a")
# Should always execute.
SET(IF_INSIDE_FOREACH_THEN_EXECUTED 1)
ELSE(1)
ELSE(${x} MATCHES "a")
# Should never execute.
SET(IF_INSIDE_FOREACH_ELSE_EXECUTED 1)
ENDIF(1)
ENDIF(${x} MATCHES "a")
ENDFOREACH(x)