BUG: CustomCommand has to use full path to Source file now

Source/cmCableWrapTclCommand.cxx

@@ -308,7 +308,7 @@ void cmCableWrapTclCommand::GenerateCableFiles() const
   depends.push_back(packageConfigName);
   
   std::vector<std::string> outputs;
-  outputs.push_back(packageTclFileName+".cxx");
+  outputs.push_back(packageTclFullName+".cxx");
   
   m_Makefile->AddCustomCommand(packageConfigName.c_str(),
                                command.c_str(),
@@ -479,7 +479,7 @@ void cmCableWrapTclCommand::GenerateCableClassFiles(const char* name,
   depends.push_back(classXmlName);
   
   std::vector<std::string> outputs;
-  outputs.push_back(classTclFileName+".cxx");
+  outputs.push_back(classTclFullName+".cxx");
   
   m_Makefile->AddCustomCommand(classConfigName.c_str(),
                                command.c_str(),

Source/cmQTWrapCPPCommand.cxx

@@ -126,7 +126,9 @@ void cmQTWrapCPPCommand::FinalPass()
     m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
 
     // set up moc command
-    std::string res = m_WrapClasses[classNum].GetSourceName() + ".cxx";
+    std::string res = m_Makefile->GetCurrentOutputDirectory();
+    res += "/";
+    res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
     
     std::vector<std::string> args;
     args.push_back("-o");

Source/cmVTKWrapJavaCommand.cxx

@@ -124,7 +124,9 @@ void cmVTKWrapJavaCommand::FinalPass()
     m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
 
     // wrap java
-    std::string res = m_WrapClasses[classNum].GetSourceName() + ".cxx";
+    std::string res = m_Makefile->GetCurrentOutputDirectory();
+    res += "/";
+    res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
     std::string res2 = resultDirectory + "/" + 
       m_OriginalNames[classNum] + ".java";
     

Source/cmVTKWrapPythonCommand.cxx

@@ -129,7 +129,9 @@ void cmVTKWrapPythonCommand::FinalPass()
   for(int classNum = 0; classNum < lastClass; classNum++)
     {
     m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
-    std::string res = m_WrapClasses[classNum].GetSourceName() + ".cxx";
+    std::string res = m_Makefile->GetCurrentOutputDirectory();
+    res += "/";
+    res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
     std::vector<std::string> args;
     args.push_back(m_WrapHeaders[classNum]);
     args.push_back(hints);

Source/cmVTKWrapTclCommand.cxx

@@ -161,15 +161,14 @@ void cmVTKWrapTclCommand::FinalPass()
   for(int classNum = 0; classNum < lastClass; classNum++)
     {
     m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
-    std::string res = m_WrapClasses[classNum].GetSourceName() + ".cxx";
     std::vector<std::string> args;
     args.push_back(m_WrapHeaders[classNum]);
     args.push_back(hints);
     args.push_back((m_WrapClasses[classNum].IsAnAbstractClass() ? "0" : "1"));
-    std::string tmp = m_Makefile->GetCurrentOutputDirectory();
-    tmp += "/";
-    tmp += m_WrapClasses[classNum].GetSourceName() + ".cxx";
-    args.push_back(tmp);
+    std::string res = m_Makefile->GetCurrentOutputDirectory();
+    res += "/";
+    res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
+    args.push_back(res);
     
     m_Makefile->AddCustomCommand(m_WrapHeaders[classNum].c_str(),
                                  wtcl.c_str(), args, depends,