diff options
author | Stephen Kelly <steveire@gmail.com> | 2012-09-21 06:51:42 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2012-09-21 11:28:53 (GMT) |
commit | 0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c (patch) | |
tree | 86d6d179c804feeaa3bcfcc188400a7b09bc0e0e /Source/cmExtraCodeBlocksGenerator.cxx | |
parent | f178d531a6a75b3cbdaa0a3dec5e0aa8daca7d24 (diff) | |
download | CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.zip CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.tar.gz CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.tar.bz2 |
Port remaining code to GetCompileDefinitions().
Diffstat (limited to 'Source/cmExtraCodeBlocksGenerator.cxx')
-rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 7953dd9..8b2daba 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -617,14 +617,17 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, " <Option compiler=\"" << compiler << "\" />\n" " <Compiler>\n"; + cmGeneratorTarget *gtgt = this->GlobalGenerator + ->GetGeneratorTarget(target); + // the compilerdefines for this target - const char* cdefs = target->GetMakefile()->GetProperty( - "COMPILE_DEFINITIONS"); - if(cdefs) + std::string cdefs = gtgt->GetCompileDefinitions(); + + if(cdefs.empty()) { // Expand the list. std::vector<std::string> defs; - cmSystemTools::ExpandListArgument(cdefs, defs); + cmSystemTools::ExpandListArgument(cdefs.c_str(), defs); for(std::vector<std::string>::const_iterator di = defs.begin(); di != defs.end(); ++di) { |