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

QtAutogen: Expand rccfiles into a vector early in the autogen process.

Browse Source 
This can be re-used as a vector.
This commit is contained in:
Stephen Kelly 2014-09-23 00:57:48 +02:00
parent 506151af51
commit a29953180c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmQtAutoGenerators.cxx
View File

@ -1052,7 +1052,10 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
"AM_Qt5Core_VERSION_MAJOR"); "AM_Qt5Core_VERSION_MAJOR");
} }
this->Sources = makefile->GetSafeDefinition("AM_SOURCES"); this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
this->RccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES"); {
std::string rccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES");
cmSystemTools::ExpandListArgument(rccSources, this->RccSources);
}
this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC"); this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC");
this->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC"); this->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC");
this->Headers = makefile->GetSafeDefinition("AM_HEADERS"); this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
@ -2074,11 +2077,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
bool cmQtAutoGenerators::GenerateQrc() bool cmQtAutoGenerators::GenerateQrc()
{ {
std::vector<std::string> sourceFiles; for(std::vector<std::string>::const_iterator si = this->RccSources.begin();
cmSystemTools::ExpandListArgument(this->RccSources, sourceFiles); si != this->RccSources.end(); ++si)
for(std::vector<std::string>::const_iterator si = sourceFiles.begin();
si != sourceFiles.end(); ++si)
{ {
std::string ext = cmsys::SystemTools::GetFilenameLastExtension(*si); std::string ext = cmsys::SystemTools::GetFilenameLastExtension(*si);

2
Source/cmQtAutoGenerators.h
View File

@ -90,7 +90,7 @@ private:
std::string QtMajorVersion; std::string QtMajorVersion;
std::string Sources; std::string Sources;
std::string RccSources; std::vector<std::string> RccSources;
std::string SkipMoc; std::string SkipMoc;
std::string SkipUic; std::string SkipUic;
std::string Headers; std::string Headers;