diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-24 12:46:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-24 12:46:22 (GMT) |
| commit | 37e34be0f5818ed3045d99c9a75c3ba5a2fe1486 (patch) | |
| tree | 7af6b51fb68d2d5cc7252a66cd2f01397e27592a | |
| parent | b2d70c1a20caf8011a1cc8b9fe5fb59a614dd959 (diff) | |
| parent | 477e4136ef525e16e9d91174bf3bfebf8b0d2650 (diff) | |
| download | CMake-37e34be0f5818ed3045d99c9a75c3ba5a2fe1486.zip CMake-37e34be0f5818ed3045d99c9a75c3ba5a2fe1486.tar.gz CMake-37e34be0f5818ed3045d99c9a75c3ba5a2fe1486.tar.bz2 | |
Merge topic 'fix-COMPILE_OPTIONS-transitive-performance-regression'
477e413 Add missing 'seen' check for evaluating COMPILE_OPTIONS.
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index e5ffb0c..6c6a7d4 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -34,7 +34,8 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( this->CheckResult = this->checkGraph(); if (CheckResult == DAG && (top->EvaluatingIncludeDirectories() - || top->EvaluatingCompileDefinitions())) + || top->EvaluatingCompileDefinitions() + || top->EvaluatingCompileOptions())) { std::map<cmStdString, std::set<cmStdString> >::const_iterator it = top->Seen.find(target); |