ENH: Allow qt ui files being it the binary dir. Bug #110 - QT_WRAP_UI problem on out-of-source builds
This commit is contained in:
parent
de16c3b926
commit
804efd91e4
|
@ -81,7 +81,22 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
|
|||
moc_file.SetName(moc_source_name.c_str(),
|
||||
m_Makefile->GetCurrentOutputDirectory(),
|
||||
"cxx",false);
|
||||
std::string origname = cdir + "/" + *j;
|
||||
std::string origname;
|
||||
if ( (*j)[0] == '/' )
|
||||
{
|
||||
origname = *j;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( curr && curr->GetPropertyAsBool("GENERATED") )
|
||||
{
|
||||
origname = std::string( m_Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
|
||||
}
|
||||
else
|
||||
{
|
||||
origname = cdir + "/" + *j;
|
||||
}
|
||||
}
|
||||
std::string hname = header_file.GetFullPath();
|
||||
m_WrapUserInterface.push_back(origname);
|
||||
// add starting depends
|
||||
|
|
Loading…
Reference in New Issue