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

Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS'

Browse Source 
33ed186 automoc: Read target defines unconditionally
This commit is contained in:
Brad King 2013-05-16 14:48:01 -04:00 committed by CMake Topic Stage
commit 5e993a2822
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmQtAutomoc.cxx
View File

@ -280,13 +280,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
_moc_incs += *incDirIt;
}
const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
std::string _moc_compile_defs;
if (tmp)
{
_moc_compile_defs = target->GetCompileDefinitions(0);
}
tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
std::string _moc_compile_defs = target->GetCompileDefinitions(0);
const char* tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
if (tmp)
{
_moc_compile_defs += ";";