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.
This commit is contained in:
parent
c1ad03bedb
commit
7bd3a1e702
|
@ -42,6 +42,12 @@ cmVTKMakeInstantiatorCommand
|
|||
std::string filePath = m_Makefile->GetCurrentOutputDirectory();
|
||||
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)
|
||||
{
|
||||
if(args[i] == "HEADER_LOCATION")
|
||||
|
@ -57,11 +63,6 @@ cmVTKMakeInstantiatorCommand
|
|||
return false;
|
||||
}
|
||||
}
|
||||
else if(args[i] == "USE_INSTANTIATOR_NEW")
|
||||
{
|
||||
includesMode = false;
|
||||
oldVersion = false;
|
||||
}
|
||||
else if(args[i] == "EXPORT_MACRO")
|
||||
{
|
||||
includesMode = false;
|
||||
|
|
Loading…
Reference in New Issue