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

corrected the generated lists .h in header list and .cxx in sources list

This commit is contained in:
Franck Bettinger 2002-09-11 16:44:52 -04:00
parent dffde0c4fa
commit 3507ef55c6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmQTWrapUICommand.cxx
View File

@ -50,6 +50,7 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
m_HeaderList = args[1]; m_HeaderList = args[1];
m_SourceList = args[2]; m_SourceList = args[2];
std::string sourceListValue; std::string sourceListValue;
std::string headerListValue;
const char *def = m_Makefile->GetDefinition(m_SourceList.c_str()); const char *def = m_Makefile->GetDefinition(m_SourceList.c_str());
if (def) if (def)
{ {
@ -95,13 +96,18 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
m_Makefile->AddSource(source_file); m_Makefile->AddSource(source_file);
m_Makefile->AddSource(moc_file); m_Makefile->AddSource(moc_file);
// create the list of sources
if (headerListValue.size() > 0)
{
headerListValue += ";";
}
headerListValue += header_file.GetSourceName() + ".h";
// create the list of sources // create the list of sources
if (sourceListValue.size() > 0) if (sourceListValue.size() > 0)
{ {
sourceListValue += ";"; sourceListValue += ";";
} }
sourceListValue += header_file.GetSourceName() + ".h";
sourceListValue += ";";
sourceListValue += source_file.GetSourceName() + ".cxx"; sourceListValue += source_file.GetSourceName() + ".cxx";
sourceListValue += ";"; sourceListValue += ";";
sourceListValue += moc_file.GetSourceName() + ".cxx"; sourceListValue += moc_file.GetSourceName() + ".cxx";
@ -109,6 +115,7 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
} }
m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str()); m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str());
m_Makefile->AddDefinition(m_HeaderList.c_str(), headerListValue.c_str());
return true; return true;
} }