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

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

This commit is contained in:
Bill Hoffman 2001-11-06 09:35:48 -05:00
parent 05a884c675
commit 319a5e0077
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmCableWrapTclCommand.cxx
View File

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

4
Source/cmQTWrapCPPCommand.cxx
View File

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

4
Source/cmVTKWrapJavaCommand.cxx
View File

@ -124,7 +124,9 @@ void cmVTKWrapJavaCommand::FinalPass()
m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str()); m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
// wrap java // 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 + "/" + std::string res2 = resultDirectory + "/" +
m_OriginalNames[classNum] + ".java"; m_OriginalNames[classNum] + ".java";

4
Source/cmVTKWrapPythonCommand.cxx
View File

@ -129,7 +129,9 @@ void cmVTKWrapPythonCommand::FinalPass()
for(int classNum = 0; classNum < lastClass; classNum++) for(int classNum = 0; classNum < lastClass; classNum++)
{ {
m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str()); 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; std::vector<std::string> args;
args.push_back(m_WrapHeaders[classNum]); args.push_back(m_WrapHeaders[classNum]);
args.push_back(hints); args.push_back(hints);

9
Source/cmVTKWrapTclCommand.cxx
View File

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