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

BUG: fix issue with CMAKE_CURENT_LIST_FILE reporting in funcitons

Browse Source
This commit is contained in:
Ken Martin 2007-12-20 10:05:08 -05:00
parent 4ca0d1ba09
commit f69a6a7c8c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmFunctionCommand.cxx
View File

@ -150,8 +150,6 @@ bool cmFunctionHelperCommand::InvokeInitialPass
this->Makefile->AddDefinition("ARGN", argnDef.c_str()); this->Makefile->AddDefinition("ARGN", argnDef.c_str());
// Invoke all the functions that were collected in the block. // Invoke all the functions that were collected in the block.
cmListFileFunction newLFF;
// for each function // for each function
for(unsigned int c = 0; c < this->Functions.size(); ++c) for(unsigned int c = 0; c < this->Functions.size(); ++c)
{ {
@ -203,6 +201,18 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
cmFunctionHelperCommand *f = new cmFunctionHelperCommand(); cmFunctionHelperCommand *f = new cmFunctionHelperCommand();
f->Args = this->Args; f->Args = this->Args;
f->Functions = this->Functions; f->Functions = this->Functions;
// Set the FilePath on the arguments to match the function since it is
// not stored and the original values may be freed
for (unsigned int i = 0; i < f->Functions.size(); ++i)
{
for (unsigned int j = 0; j < f->Functions[i].Arguments.size(); ++j)
{
f->Functions[i].Arguments[j].FilePath =
f->Functions[i].FilePath.c_str();
}
}
std::string newName = "_" + this->Args[0]; std::string newName = "_" + this->Args[0];
mf.GetCMakeInstance()->RenameCommand(this->Args[0].c_str(), mf.GetCMakeInstance()->RenameCommand(this->Args[0].c_str(),
newName.c_str()); newName.c_str());