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

ENH: Changed check for which version of instantiators to generate to look for definition of VTK_USE_INSTANTIATOR_NEW instead of an extra argument to VTK_MAKE_INSTANTIATOR.

Browse Source
This commit is contained in:
Brad King 2002-08-16 09:31:10 -04:00
parent c1ad03bedb
commit 7bd3a1e702
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmVTKMakeInstantiatorCommand.cxx
View File

@ -42,6 +42,12 @@ cmVTKMakeInstantiatorCommand
std::string filePath = m_Makefile->GetCurrentOutputDirectory(); std::string filePath = m_Makefile->GetCurrentOutputDirectory();
std::string headerPath = filePath; std::string headerPath = filePath;
// Check whether to use the old or new form.
if(m_Makefile->GetDefinition("VTK_USE_INSTANTIATOR_NEW"))
{
oldVersion = false;
}
for(unsigned int i=2;i < args.size();++i) for(unsigned int i=2;i < args.size();++i)
{ {
if(args[i] == "HEADER_LOCATION") if(args[i] == "HEADER_LOCATION")
@ -57,11 +63,6 @@ cmVTKMakeInstantiatorCommand
return false; return false;
} }
} }
else if(args[i] == "USE_INSTANTIATOR_NEW")
{
includesMode = false;
oldVersion = false;
}
else if(args[i] == "EXPORT_MACRO") else if(args[i] == "EXPORT_MACRO")
{ {
includesMode = false; includesMode = false;