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

BUG: Fix Bug #186 - QT_WRAP_UI uses the path twice

This commit is contained in:
Andy Cedilnik 2003-09-24 17:50:39 -04:00
parent c056415593
commit c968abd2c1
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmQTWrapCPPCommand.cxx
View File

@ -76,7 +76,22 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
std::string newName = "moc_" + srcName; std::string newName = "moc_" + srcName;
file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false); "cxx",false);
std::string hname = cdir + "/" + *j; std::string hname;
if ( (*j)[0] == '/' || (*j)[1] == ':' )
{
hname = *j;
}
else
{
if ( curr && curr->GetPropertyAsBool("GENERATED") )
{
hname = std::string( m_Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
}
else
{
hname = cdir + "/" + *j;
}
}
m_WrapHeaders.push_back(hname); m_WrapHeaders.push_back(hname);
// add starting depends // add starting depends
file.GetDepends().push_back(hname); file.GetDepends().push_back(hname);