Răsfoiți Sursa

BUG: Fix dependency to input file for QT_WRAP_CPP. Bug #421 - QT_WRAP_CPP

Andy Cedilnik 22 ani în urmă
părinte
comite
15cdf406d6

+ 4 - 1
Source/cmQTWrapCPPCommand.cxx

@@ -144,12 +144,15 @@ void cmQTWrapCPPCommand::FinalPass()
     args.push_back(res);
     args.push_back(m_WrapHeaders[classNum]);
 
+    std::vector<std::string> realdepends = depends;
+    realdepends.push_back(m_WrapHeaders[classNum]);
+
     m_Makefile->AddCustomCommandToOutput(
       res.c_str(),
       moc_exe.c_str(),
       args,
       0,
-      depends,
+      realdepends,
       "QT Wrapped File",
       0);
     }

+ 1 - 1
Tests/Wrapping/CMakeLists.txt

@@ -118,7 +118,7 @@ IF (QT_FOUND)
     ${CMAKE_CURRENT_BINARY_DIR}/foo.ui
     )
   QT_WRAP_UI (myqtlib QTUI_H_SRCS QTUI_S_SRCS ${QTUI_SRCS})
-  QT_WRAP_CPP (myqtlib QT_MOC_SRCS ${SRCS})
+  QT_WRAP_CPP (myqtlib QT_MOC_SRCS ${SRCS} vtkTestMoc.h)
 
   MESSAGE("QT files are ${QTUI_S_SRCS}")
   MESSAGE("QT other files are ${QTUI_H_SRCS}")

+ 8 - 0
Tests/Wrapping/vtkTestMoc.h

@@ -0,0 +1,8 @@
+#include <qapplication.h>
+
+class Foo : public QApplication
+{
+  Q_OBJECT
+public:
+  Foo();
+};