diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-11-19 18:30:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-12-20 11:17:37 (GMT) |
| commit | 76ea420fb9a8ceada0e806f1201230e5a7c1202c (patch) | |
| tree | 3cb2ec0d1a5470a1a76d426e1fabfb5bc53fc2f3 /Source/cmGeneratorTarget.cxx | |
| parent | 5ac16ea6e4ddb086d48c97fa4f58543284ec3305 (diff) | |
| download | CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.zip CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.tar.gz CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.tar.bz2 | |
Use cmsys::auto_ptr to manage cmCompiledGeneratorExpressions
The compiled generator expressions need to outlive the creating
type. For the same reason, store the input string in a std::string.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index de8b5e3..55507dd 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -267,7 +267,7 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories( "INCLUDE_DIRECTORIES", 0, 0); cmSystemTools::ExpandListArgument(ge.Parse(prop) - .Evaluate(this->Makefile, + ->Evaluate(this->Makefile, config, false, this->Target, @@ -315,7 +315,7 @@ std::string cmGeneratorTarget::GetCompileDefinitions(const char *config) cmGeneratorExpressionDAGChecker dagChecker(lfbt, this->GetName(), defPropName, 0, 0); - return ge.Parse(prop).Evaluate(this->Makefile, + return ge.Parse(prop)->Evaluate(this->Makefile, config, false, this->Target, |