Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS'
33ed186 automoc: Read target defines unconditionally
This commit is contained in:
commit
5e993a2822
@ -280,13 +280,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
|
|||||||
_moc_incs += *incDirIt;
|
_moc_incs += *incDirIt;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
|
std::string _moc_compile_defs = target->GetCompileDefinitions(0);
|
||||||
std::string _moc_compile_defs;
|
|
||||||
if (tmp)
|
const char* tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
|
||||||
{
|
|
||||||
_moc_compile_defs = target->GetCompileDefinitions(0);
|
|
||||||
}
|
|
||||||
tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
|
|
||||||
if (tmp)
|
if (tmp)
|
||||||
{
|
{
|
||||||
_moc_compile_defs += ";";
|
_moc_compile_defs += ";";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user