summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenerators.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-09-22 22:57:48 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-10-23 18:35:26 (GMT)
commita29953180c21ba0d56fb236eb58bafd40ae68961 (patch)
treeaa8302ce8af9abde85ecf4f8d4543e457b6a82f7 /Source/cmQtAutoGenerators.cxx
parent506151af519aa50594000d22c66c0620f026878f (diff)
downloadCMake-a29953180c21ba0d56fb236eb58bafd40ae68961.zip
CMake-a29953180c21ba0d56fb236eb58bafd40ae68961.tar.gz
CMake-a29953180c21ba0d56fb236eb58bafd40ae68961.tar.bz2
QtAutogen: Expand rccfiles into a vector early in the autogen process.
This can be re-used as a vector.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r--Source/cmQtAutoGenerators.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f709932..7b81f4f 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1052,7 +1052,10 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
"AM_Qt5Core_VERSION_MAJOR");
}
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->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC");
this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
@@ -2074,11 +2077,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
bool cmQtAutoGenerators::GenerateQrc()
{
- std::vector<std::string> sourceFiles;
- cmSystemTools::ExpandListArgument(this->RccSources, sourceFiles);
-
- for(std::vector<std::string>::const_iterator si = sourceFiles.begin();
- si != sourceFiles.end(); ++si)
+ for(std::vector<std::string>::const_iterator si = this->RccSources.begin();
+ si != this->RccSources.end(); ++si)
{
std::string ext = cmsys::SystemTools::GetFilenameLastExtension(*si);