diff options
| author | Franck Bettinger <bettingf@cs.man.ac.uk> | 2001-11-09 17:07:37 (GMT) |
|---|---|---|
| committer | Franck Bettinger <bettingf@cs.man.ac.uk> | 2001-11-09 17:07:37 (GMT) |
| commit | 53d0de2a9f0359396b48e398f79030a733fcb5de (patch) | |
| tree | 072e28fd0fc0093f239ee460d62102fab14920f1 | |
| parent | becce939a2ca00ee15b7beb722dea311efdd2573 (diff) | |
| download | CMake-53d0de2a9f0359396b48e398f79030a733fcb5de.zip CMake-53d0de2a9f0359396b48e398f79030a733fcb5de.tar.gz CMake-53d0de2a9f0359396b48e398f79030a733fcb5de.tar.bz2 | |
cleanups
| -rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 9 | ||||
| -rw-r--r-- | Source/cmQTWrapCPPCommand.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index 5bc701e..adbd036 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -103,7 +103,6 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args) // add starting depends file.GetDepends().push_back(hname); m_WrapClasses.push_back(file); - m_OriginalNames.push_back(curr.GetSourceName()); } } } @@ -123,7 +122,13 @@ void cmQTWrapCPPCommand::FinalPass() // wrap all the .h files depends.push_back(moc_exe); - std::string moc_list(""); + const char * GENERATED_QT_FILES_value= + m_Makefile->GetDefinition("GENERATED_QT_FILES"); + std::string moc_list(""); + if (GENERATED_QT_FILES_value!=0) + { + moc_list=moc_list+GENERATED_QT_FILES_value; + } for(int classNum = 0; classNum < lastClass; classNum++) { diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h index 684eec6..09f79e7 100644 --- a/Source/cmQTWrapCPPCommand.h +++ b/Source/cmQTWrapCPPCommand.h @@ -68,7 +68,6 @@ private: * List of header files that pprovide the source for m_WrapClasses. */ std::vector<std::string> m_WrapHeaders; - std::vector<std::string> m_OriginalNames; std::string m_LibraryName; std::string m_SourceList; }; |