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

BUG: fix for bug 7239, DEFINITIONS property not backwards compatible to 2.4

Browse Source
This commit is contained in:
Bill Hoffman 2008-06-25 09:44:56 -04:00
parent 4aa35cee98
commit 02ff910044
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmMakefile.cxx
View File

@ -2954,8 +2954,21 @@ const char *cmMakefile::GetProperty(const char* prop,
return output.c_str(); return output.c_str();
} }
else if (!strcmp("DEFINITIONS",prop)) else if (!strcmp("DEFINITIONS",prop))
{ {
output = this->GetDefineFlags(); if(const char* cdefs = this->GetProperty("COMPILE_DEFINITIONS"))
{
// Expand the list.
std::vector<std::string> defs;
cmSystemTools::ExpandListArgument(cdefs, defs);
for(std::vector<std::string>::iterator i = defs.begin();
i != defs.end(); ++i)
{
output += "-D";
output += *i;
output += " ";
}
}
output += this->GetDefineFlags();
return output.c_str(); return output.c_str();
} }
else if (!strcmp("INCLUDE_DIRECTORIES",prop) ) else if (!strcmp("INCLUDE_DIRECTORIES",prop) )