mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 20:28:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

QtAutogen: Inline single use variable definitions

Browse Source
This commit is contained in:
Sebastian Holtermann
2016-12-02 12:13:59 +01:00
committed by Brad King
parent b770b85d6c
commit d9996aab74
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -115,17 +115,14 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
for (std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin(); for (std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
fileIt != srcFiles.end(); ++fileIt) { fileIt != srcFiles.end(); ++fileIt) {
cmSourceFile* sf = *fileIt; cmSourceFile* sf = *fileIt;
std::string absFile = cmsys::SystemTools::GetRealPath(sf->GetFullPath()); const std::string absFile =
bool skipFileForMoc = cmsys::SystemTools::GetRealPath(sf->GetFullPath());
cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC")); const std::string ext = sf->GetExtension();
bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"))) { if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"))) {
skipUic.push_back(absFile); skipUic.push_back(absFile);
} }
std::string ext = sf->GetExtension();
if (target->GetPropertyAsBool("AUTORCC")) { if (target->GetPropertyAsBool("AUTORCC")) {
if (ext == "qrc" && if (ext == "qrc" &&
!cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"))) { !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"))) {
@@ -146,8 +143,8 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
} }
} }
if (!generated) { if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) {
if (skipFileForMoc) { if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"))) {
skipMoc.push_back(absFile); skipMoc.push_back(absFile);
} else { } else {
cmSystemTools::FileFormat fileType = cmSystemTools::FileFormat fileType =