diff options
| -rw-r--r-- | Source/cmVTKWrapPythonCommand.cxx | 35 | ||||
| -rw-r--r-- | Source/cmVTKWrapTclCommand.cxx | 35 |
2 files changed, 32 insertions, 38 deletions
diff --git a/Source/cmVTKWrapPythonCommand.cxx b/Source/cmVTKWrapPythonCommand.cxx index 2c84b5f..b138422 100644 --- a/Source/cmVTKWrapPythonCommand.cxx +++ b/Source/cmVTKWrapPythonCommand.cxx @@ -71,27 +71,24 @@ bool cmVTKWrapPythonCommand::Invoke(std::vector<std::string>& args) for(std::vector<std::string>::iterator j = (args.begin() + 2); j != args.end(); ++j) { - for(cmMakefile::SourceMap::iterator l = Classes.begin(); - l != Classes.end(); l++) + cmMakefile::SourceMap::iterator l = Classes.find(*j); + for(std::vector<cmSourceFile>::iterator i = l->second.begin(); + i != l->second.end(); i++) { - for(std::vector<cmSourceFile>::iterator i = l->second.begin(); - i != l->second.end(); i++) + cmSourceFile &curr = *i; + // if we should wrap the class + if (!curr.GetWrapExclude()) { - cmSourceFile &curr = *i; - // if we should wrap the class - if (!curr.GetWrapExclude()) - { - cmSourceFile file; - file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); - std::string newName = curr.GetSourceName() + "Python"; - file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), - "cxx",false); - std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; - m_WrapHeaders.push_back(hname); - // add starting depends - file.GetDepends().push_back(hname); - m_WrapClasses.push_back(file); - } + cmSourceFile file; + file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); + std::string newName = curr.GetSourceName() + "Python"; + file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), + "cxx",false); + std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; + m_WrapHeaders.push_back(hname); + // add starting depends + file.GetDepends().push_back(hname); + m_WrapClasses.push_back(file); } } } diff --git a/Source/cmVTKWrapTclCommand.cxx b/Source/cmVTKWrapTclCommand.cxx index 44579d9..7f3958a 100644 --- a/Source/cmVTKWrapTclCommand.cxx +++ b/Source/cmVTKWrapTclCommand.cxx @@ -71,27 +71,24 @@ bool cmVTKWrapTclCommand::Invoke(std::vector<std::string>& args) for(std::vector<std::string>::iterator j = (args.begin() + 2); j != args.end(); ++j) { - for(cmMakefile::SourceMap::iterator l = Classes.begin(); - l != Classes.end(); l++) + cmMakefile::SourceMap::iterator l = Classes.find(*j); + for(std::vector<cmSourceFile>::iterator i = l->second.begin(); + i != l->second.end(); i++) { - for(std::vector<cmSourceFile>::iterator i = l->second.begin(); - i != l->second.end(); i++) + cmSourceFile &curr = *i; + // if we should wrap the class + if (!curr.GetWrapExclude()) { - cmSourceFile &curr = *i; - // if we should wrap the class - if (!curr.GetWrapExclude()) - { - cmSourceFile file; - file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); - std::string newName = curr.GetSourceName() + "Tcl"; - file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), - "cxx",false); - std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; - m_WrapHeaders.push_back(hname); - // add starting depends - file.GetDepends().push_back(hname); - m_WrapClasses.push_back(file); - } + cmSourceFile file; + file.SetIsAnAbstractClass(curr.IsAnAbstractClass()); + std::string newName = curr.GetSourceName() + "Tcl"; + file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), + "cxx",false); + std::string hname = cdir + "/" + curr.GetSourceName() + ".h"; + m_WrapHeaders.push_back(hname); + // add starting depends + file.GetDepends().push_back(hname); + m_WrapClasses.push_back(file); } } } |