summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpression.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-25 18:12:02 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-02-25 18:12:02 (GMT)
commitb887bca6ee3651857be663fe1f2e2f2c1ed1ac1e (patch)
tree26a9d0ed2226fa86be6cbffe6ffbbd661c6a40b1 /Source/cmGeneratorExpression.cxx
parent6e567cabea8df6f8fc8c401f4b9bfe2997c4399e (diff)
parent236133e79e2d047810eeba90915e38d9861e2a22 (diff)
downloadCMake-b887bca6ee3651857be663fe1f2e2f2c1ed1ac1e.zip
CMake-b887bca6ee3651857be663fe1f2e2f2c1ed1ac1e.tar.gz
CMake-b887bca6ee3651857be663fe1f2e2f2c1ed1ac1e.tar.bz2
Merge topic 'try_compile-targets'
236133e Handle targets in the LINK_LIBRARIES of try_compile. 1c0597c Add a new Export generator for IMPORTED targets. f2ab17d Keep track of all targets seen while evaluating a genex.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r--Source/cmGeneratorExpression.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 5d162fe..51ebddb 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -114,7 +114,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(
this->HadContextSensitiveCondition = context.HadContextSensitiveCondition;
}
- this->Targets = context.Targets;
+ this->DependTargets = context.DependTargets;
+ this->AllTargetsSeen = context.AllTargets;
// TODO: Return a std::string from here instead?
return this->Output.c_str();
}