From c968abd2c1796e85bd935fe0149489c52abb06e7 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Wed, 24 Sep 2003 17:50:39 -0400
Subject: BUG: Fix Bug #186 - QT_WRAP_UI uses the path twice

---
 Source/cmQTWrapCPPCommand.cxx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx
index e358e2d..6800a54 100644
--- a/Source/cmQTWrapCPPCommand.cxx
+++ b/Source/cmQTWrapCPPCommand.cxx
@@ -76,7 +76,22 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
       std::string newName = "moc_" + srcName;
       file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
                    "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);
       // add starting depends
       file.GetDepends().push_back(hname);
-- 
cgit v0.12