diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-01-05 16:13:50 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-01-05 16:13:50 (GMT) |
| commit | 15cdf406d629d80e83910cd064bdb832057e64ca (patch) | |
| tree | e274321c83c8136d66dd23c8d78f2778d7371699 | |
| parent | fca398f961e1b9b950f79f180bb3826b8368a985 (diff) | |
| download | CMake-15cdf406d629d80e83910cd064bdb832057e64ca.zip CMake-15cdf406d629d80e83910cd064bdb832057e64ca.tar.gz CMake-15cdf406d629d80e83910cd064bdb832057e64ca.tar.bz2 | |
BUG: Fix dependency to input file for QT_WRAP_CPP. Bug #421 - QT_WRAP_CPP
| -rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 5 | ||||
| -rw-r--r-- | Tests/Wrapping/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Wrapping/vtkTestMoc.h | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index a446ded..6bc9798 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/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); } diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index 7a74826..8aeec0d 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/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}") diff --git a/Tests/Wrapping/vtkTestMoc.h b/Tests/Wrapping/vtkTestMoc.h new file mode 100644 index 0000000..f11a927 --- /dev/null +++ b/Tests/Wrapping/vtkTestMoc.h @@ -0,0 +1,8 @@ +#include <qapplication.h> + +class Foo : public QApplication +{ + Q_OBJECT +public: + Foo(); +}; |