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

QtAutogen: Remove read of SKIP_AUTOUIC target property.

Browse Source 
Skipping AUTOUIC for a target is achieved by setting the AUTOUIC
target property go OFF.
This commit is contained in:
Stephen Kelly 2014-01-24 13:12:10 +01:00
parent 321e348e13
commit 0d934efd59
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmQtAutoGenerators.cxx
View File

@ -652,8 +652,6 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
std::string skip_uic; std::string skip_uic;
const char *sep = ""; const char *sep = "";
bool skip = target->GetPropertyAsBool("SKIP_AUTOUIC");
std::set<cmStdString> skipped; std::set<cmStdString> skipped;
for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin(); for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
@ -663,12 +661,8 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
cmSourceFile* sf = *fileIt; cmSourceFile* sf = *fileIt;
std::string absFile = cmsys::SystemTools::GetRealPath( std::string absFile = cmsys::SystemTools::GetRealPath(
sf->GetFullPath().c_str()); sf->GetFullPath().c_str());
if (!skip)
{
skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
}
if (skip) if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC")))
{ {
skip_uic += sep; skip_uic += sep;
skip_uic += absFile; skip_uic += absFile;