fixed bug in limiting to source lists

This commit is contained in:
Ken Martin 2001-05-01 17:52:36 -04:00
parent 1d4a3aa48e
commit 6d5508e64b
2 changed files with 32 additions and 38 deletions

View File

@ -71,27 +71,24 @@ bool cmVTKWrapPythonCommand::Invoke(std::vector<std::string>& args)
for(std::vector<std::string>::iterator j = (args.begin() + 2); for(std::vector<std::string>::iterator j = (args.begin() + 2);
j != args.end(); ++j) j != args.end(); ++j)
{ {
for(cmMakefile::SourceMap::iterator l = Classes.begin(); cmMakefile::SourceMap::iterator l = Classes.find(*j);
l != Classes.end(); l++) for(std::vector<cmSourceFile>::iterator i = l->second.begin();
i != l->second.end(); i++)
{ {
for(std::vector<cmSourceFile>::iterator i = l->second.begin(); cmSourceFile &curr = *i;
i != l->second.end(); i++) // if we should wrap the class
if (!curr.GetWrapExclude())
{ {
cmSourceFile &curr = *i; cmSourceFile file;
// if we should wrap the class file.SetIsAnAbstractClass(curr.IsAnAbstractClass());
if (!curr.GetWrapExclude()) std::string newName = curr.GetSourceName() + "Python";
{ file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
cmSourceFile file; "cxx",false);
file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); std::string hname = cdir + "/" + curr.GetSourceName() + ".h";
std::string newName = curr.GetSourceName() + "Python"; m_WrapHeaders.push_back(hname);
file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), // add starting depends
"cxx",false); file.GetDepends().push_back(hname);
std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; m_WrapClasses.push_back(file);
m_WrapHeaders.push_back(hname);
// add starting depends
file.GetDepends().push_back(hname);
m_WrapClasses.push_back(file);
}
} }
} }
} }

View File

@ -71,27 +71,24 @@ bool cmVTKWrapTclCommand::Invoke(std::vector<std::string>& args)
for(std::vector<std::string>::iterator j = (args.begin() + 2); for(std::vector<std::string>::iterator j = (args.begin() + 2);
j != args.end(); ++j) j != args.end(); ++j)
{ {
for(cmMakefile::SourceMap::iterator l = Classes.begin(); cmMakefile::SourceMap::iterator l = Classes.find(*j);
l != Classes.end(); l++) for(std::vector<cmSourceFile>::iterator i = l->second.begin();
i != l->second.end(); i++)
{ {
for(std::vector<cmSourceFile>::iterator i = l->second.begin(); cmSourceFile &curr = *i;
i != l->second.end(); i++) // if we should wrap the class
if (!curr.GetWrapExclude())
{ {
cmSourceFile &curr = *i; cmSourceFile file;
// if we should wrap the class file.SetIsAnAbstractClass(curr.IsAnAbstractClass());
if (!curr.GetWrapExclude()) std::string newName = curr.GetSourceName() + "Tcl";
{ file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
cmSourceFile file; "cxx",false);
file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); std::string hname = cdir + "/" + curr.GetSourceName() + ".h";
std::string newName = curr.GetSourceName() + "Tcl"; m_WrapHeaders.push_back(hname);
file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), // add starting depends
"cxx",false); file.GetDepends().push_back(hname);
std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; m_WrapClasses.push_back(file);
m_WrapHeaders.push_back(hname);
// add starting depends
file.GetDepends().push_back(hname);
m_WrapClasses.push_back(file);
}
} }
} }
} }