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

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:
Andy Cedilnik 2003-07-30 13:27:41 -04:00
parent de16c3b926
commit 804efd91e4
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/cmQTWrapUICommand.cxx
View File

@ -81,7 +81,22 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
moc_file.SetName(moc_source_name.c_str(), moc_file.SetName(moc_source_name.c_str(),
m_Makefile->GetCurrentOutputDirectory(), m_Makefile->GetCurrentOutputDirectory(),
"cxx",false); "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(); std::string hname = header_file.GetFullPath();
m_WrapUserInterface.push_back(origname); m_WrapUserInterface.push_back(origname);
// add starting depends // add starting depends