Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 15:32:10 +08:00
Code Issues Projects Releases Wiki Activity

Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions

Browse Source 
The purpose of this patch is to allow later removal of
AUTOGEN specific variables in cmMakefile and cmSourceFile.
This commit is contained in:
Sebastian Holtermann
2017-08-22 14:18:16 +02:00
parent 13bb716f04
commit 0f2e178f65
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -531,25 +531,25 @@ static void SetupAutoTargetUic(cmGeneratorTarget const* target,
std::vector<std::string> uiFileFiles;
std::vector<std::string> uiFileOptions;
{
const std::set<std::string> skipped(setup.uicSkip.begin(),
setup.uicSkip.end());
const std::vector<cmSourceFile*> uiFilesWithOptions =
makefile->GetQtUiFilesWithOptions();
for (std::vector<cmSourceFile*>::const_iterator fileIt =
uiFilesWithOptions.begin();
fileIt != uiFilesWithOptions.end(); ++fileIt) {
cmSourceFile* sf = *fileIt;
const std::string absFile =
cmsys::SystemTools::GetRealPath(sf->GetFullPath());
if (skipped.find(absFile) == skipped.end()) {
// The file wasn't skipped
uiFileFiles.push_back(absFile);
{
std::string opts = sf->GetProperty("AUTOUIC_OPTIONS");
cmSystemTools::ReplaceString(opts, ";",
cmQtAutoGeneratorCommon::listSep);
uiFileOptions.push_back(opts);
const std::string uiExt = "ui";
const std::vector<cmSourceFile*>& srcFiles = makefile->GetSourceFiles();
for (std::vector<cmSourceFile*>::const_iterator fit = srcFiles.begin();
fit != srcFiles.end(); ++fit) {
cmSourceFile* sf = *fit;
// sf->GetExtension() is only valid after sf->GetFullPath() ...
const std::string& fPath = sf->GetFullPath();
if (sf->GetExtension() == uiExt) {
// Check if the files has uic options
std::string uicOpts = sf->GetProperty("AUTOUIC_OPTIONS");
if (!uicOpts.empty()) {
const std::string absFile = cmsys::SystemTools::GetRealPath(fPath);
// Check if file isn't skipped
if (setup.uicSkip.count(absFile) == 0) {
uiFileFiles.push_back(absFile);
cmSystemTools::ReplaceString(uicOpts, ";",
cmQtAutoGeneratorCommon::listSep);
uiFileOptions.push_back(uicOpts);
}
}
}
}