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

fixed commands that were setting definitions in final pass to set definitions in initial pass

This commit is contained in:
Ken Martin 2002-06-30 13:53:08 -04:00
parent 0b88e57e54
commit e0c3d1e959
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmVTKWrapPythonCommand.cxx
View File

@ -53,17 +53,11 @@ bool cmVTKWrapPythonCommand::InitialPass(std::vector<std::string> const& argsIn)
// Create the init file // Create the init file
std::string res = m_LibraryName; std::string res = m_LibraryName;
res += "Init.cxx"; res += "Init.cxx";
this->CreateInitFile(res);
// add the init file // add the init file
cmSourceFile cfile; std::string initName = m_LibraryName;
cfile.SetIsAnAbstractClass(false); initName += "Init";
std::string newName = m_LibraryName; sourceListValue += initName + ".cxx";
newName += "Init";
cfile.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false);
m_Makefile->AddSource(cfile);
sourceListValue += newName + ".cxx";
// get the list of classes for this library // get the list of classes for this library
for(std::vector<std::string>::iterator j = (args.begin() + 2); for(std::vector<std::string>::iterator j = (args.begin() + 2);
@ -93,6 +87,12 @@ bool cmVTKWrapPythonCommand::InitialPass(std::vector<std::string> const& argsIn)
} }
} }
cmSourceFile cfile;
cfile.SetIsAnAbstractClass(false);
this->CreateInitFile(res);
cfile.SetName(initName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false);
m_Makefile->AddSource(cfile);
m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str()); m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str());
return true; return true;
} }

21
Source/cmVTKWrapTclCommand.cxx
View File

@ -94,17 +94,7 @@ bool cmVTKWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
// Create the init file // Create the init file
std::string res = m_LibraryName; std::string res = m_LibraryName;
res += "Init.cxx"; res += "Init.cxx";
this->CreateInitFile(res); sourceListValue += res;
// add the init file
cmSourceFile cfile;
cfile.SetIsAnAbstractClass(false);
std::string newName = m_LibraryName;
newName += "Init";
cfile.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false);
m_Makefile->AddSource(cfile);
sourceListValue += newName + ".cxx";
for(std::vector<std::string>::iterator j = (sources.begin() + 1); for(std::vector<std::string>::iterator j = (sources.begin() + 1);
j != sources.end(); ++j) j != sources.end(); ++j)
@ -132,6 +122,15 @@ bool cmVTKWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
sourceListValue += newName + ".cxx"; sourceListValue += newName + ".cxx";
} }
} }
// add the init file
cmSourceFile cfile;
cfile.SetIsAnAbstractClass(false);
std::string newName = m_LibraryName;
newName += "Init";
this->CreateInitFile(res);
cfile.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false);
m_Makefile->AddSource(cfile);
m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str()); m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str());
} }