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

Automoc: also the makefile-COMPILE_DEFINITIONS 

Alex
This commit is contained in:
Alex Neundorf 2012-09-06 22:22:16 +02:00
parent 894e91a945
commit ea12871241
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmQtAutomoc.cxx
View File

@ -209,6 +209,12 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
if (tmp)
{
_moc_compile_defs += ";";
_moc_compile_defs += tmp;
}
tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
std::string _moc_options = (tmp!=0 ? tmp : "");