Fix a problem with TCL wrapping if the source files have a relative path.
The dependency is not correctly handled
This commit is contained in:
parent
a906703919
commit
413154827c
|
@ -105,13 +105,15 @@ bool cmVTKWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
|
||||||
if (!curr || !curr->GetPropertyAsBool("WRAP_EXCLUDE"))
|
if (!curr || !curr->GetPropertyAsBool("WRAP_EXCLUDE"))
|
||||||
{
|
{
|
||||||
cmSourceFile file;
|
cmSourceFile file;
|
||||||
|
std::string srcDir = cdir;
|
||||||
if (curr)
|
if (curr)
|
||||||
{
|
{
|
||||||
file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT"));
|
file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT"));
|
||||||
|
srcDir = cmSystemTools::GetFilenamePath(curr->GetFullPath());
|
||||||
}
|
}
|
||||||
std::string srcName = cmSystemTools::GetFilenameWithoutExtension(*j);
|
std::string srcName = cmSystemTools::GetFilenameWithoutExtension(*j);
|
||||||
std::string newName = srcName + "Tcl";
|
std::string newName = srcName + "Tcl";
|
||||||
std::string hname = cdir + "/" + srcName + ".h";
|
std::string hname = srcDir + "/" + srcName + ".h";
|
||||||
file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
|
file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
|
||||||
"cxx",false);
|
"cxx",false);
|
||||||
m_WrapHeaders.push_back(hname);
|
m_WrapHeaders.push_back(hname);
|
||||||
|
|
Loading…
Reference in New Issue