diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-06-06 16:13:35 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-11 06:23:56 (GMT) |
| commit | 184121538c2576b2113c0e256ecb0cd9ac354134 (patch) | |
| tree | 20ed38bafe4ff886b00c0ff6160f45744465b3ac /Source/cmQtAutomoc.cxx | |
| parent | afc9243c325c37ac7364af12a10adffd7dd81d25 (diff) | |
| download | CMake-184121538c2576b2113c0e256ecb0cd9ac354134.zip CMake-184121538c2576b2113c0e256ecb0cd9ac354134.tar.gz CMake-184121538c2576b2113c0e256ecb0cd9ac354134.tar.bz2 | |
Refactor cmTarget::GetCompileDefinitions to use an out-vector, not a string.
Refactor to create AddCompileDefinitions.
Diffstat (limited to 'Source/cmQtAutomoc.cxx')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 34b3c7e..93e39ab 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -175,15 +175,17 @@ static void GetCompileDefinitionsAndDirectories(cmTarget *target, incs += *incDirIt; } - defs = target->GetCompileDefinitions(config); + std::set<std::string> defines; + localGen->AddCompileDefinitions(defines, target, config); - const char *tmp = makefile->GetProperty("COMPILE_DEFINITIONS"); sep = ""; - if (tmp) + for(std::set<std::string>::const_iterator defIt = defines.begin(); + defIt != defines.end(); + ++defIt) { defs += sep; sep = ";"; - defs += tmp; + defs += *defIt; } } |