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

2 files changed, 19 insertions, 20 deletions

diff --git a/Source/cmVTKWrapPythonCommand.cxx b/Source/cmVTKWrapPythonCommand.cxx
index be21948..9000689 100644
--- a/Source/cmVTKWrapPythonCommand.cxx
+++ b/Source/cmVTKWrapPythonCommand.cxx
@@ -53,17 +53,11 @@ bool cmVTKWrapPythonCommand::InitialPass(std::vector<std::string> const& argsIn)
   // Create the init file 
   std::string res = m_LibraryName;
   res += "Init.cxx";
-  this->CreateInitFile(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";
+  std::string initName = m_LibraryName;
+  initName += "Init";
+  sourceListValue += initName + ".cxx";
 
   // get the list of classes for this library
   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());
   return true;
 }
diff --git a/Source/cmVTKWrapTclCommand.cxx b/Source/cmVTKWrapTclCommand.cxx
index f7107f6..7dc38a6 100644
--- a/Source/cmVTKWrapTclCommand.cxx
+++ b/Source/cmVTKWrapTclCommand.cxx
@@ -94,17 +94,7 @@ bool cmVTKWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
     // Create the init file 
     std::string res = m_LibraryName;
     res += "Init.cxx";
-    this->CreateInitFile(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";
+    sourceListValue += res;
     
     for(std::vector<std::string>::iterator j = (sources.begin() + 1);
         j != sources.end(); ++j)
@@ -132,6 +122,15 @@ bool cmVTKWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
         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());  
     }