diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-06 14:35:48 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-06 14:35:48 (GMT) |
| commit | 319a5e007713726e1548148045b157eb286f1ef9 (patch) | |
| tree | c58e4d05bfba8d63b6da93135ec826b9fe107409 | |
| parent | 05a884c675b0fb7693e46502c57f3cd663c5691d (diff) | |
| download | CMake-319a5e007713726e1548148045b157eb286f1ef9.zip CMake-319a5e007713726e1548148045b157eb286f1ef9.tar.gz CMake-319a5e007713726e1548148045b157eb286f1ef9.tar.bz2 | |
BUG: CustomCommand has to use full path to Source file now
| -rw-r--r-- | Source/cmCableWrapTclCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmVTKWrapJavaCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmVTKWrapPythonCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmVTKWrapTclCommand.cxx | 9 |
5 files changed, 15 insertions, 10 deletions
diff --git a/Source/cmCableWrapTclCommand.cxx b/Source/cmCableWrapTclCommand.cxx index b1b0a7a..84cb44d 100644 --- a/Source/cmCableWrapTclCommand.cxx +++ b/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(), diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index 8592307..f3bfc97 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/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"); diff --git a/Source/cmVTKWrapJavaCommand.cxx b/Source/cmVTKWrapJavaCommand.cxx index 033cf09..bfa8235 100644 --- a/Source/cmVTKWrapJavaCommand.cxx +++ b/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"; diff --git a/Source/cmVTKWrapPythonCommand.cxx b/Source/cmVTKWrapPythonCommand.cxx index 09e8acc..56691d3 100644 --- a/Source/cmVTKWrapPythonCommand.cxx +++ b/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); diff --git a/Source/cmVTKWrapTclCommand.cxx b/Source/cmVTKWrapTclCommand.cxx index 66ba407..20d832c 100644 --- a/Source/cmVTKWrapTclCommand.cxx +++ b/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, |