Commit aaf3859e authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'refactor-usage-requirements'

2682714a cmGeneratorTarget: Refactor usage requirement genex evaluation
3cbc1577 cmGeneratorTarget: Move static functions to anonymous namespace
33494a50 cmGeneratorTarget: Order usage requirement processing logic consistently
c131e62f cmGeneratorTarget: Remove unnecessary copy to local variable
fab72918 cmGeneratorTarget: Remove unused member of internal class
95d3598e cmGeneratorExpressionDAGChecker: Avoid const_cast
Acked-by: Kitware Robot's avatarKitware Robot <>
Acked-by: Marc Chevrier's avatarMarc Chevrier <>
Merge-request: !3578
parents 9e420754 2682714a
Pipeline #141806 failed with stage
in 0 seconds
...@@ -68,9 +68,7 @@ void cmGeneratorExpressionDAGChecker::Initialize() ...@@ -68,9 +68,7 @@ void cmGeneratorExpressionDAGChecker::Initialize()
return; return;
} }
} }
const_cast<cmGeneratorExpressionDAGChecker*>(top) top->Seen[this->Target].insert(this->Property);
} }
} }
...@@ -88,7 +88,7 @@ private: ...@@ -88,7 +88,7 @@ private:
const cmGeneratorExpressionDAGChecker* const Parent; const cmGeneratorExpressionDAGChecker* const Parent;
cmGeneratorTarget const* Target; cmGeneratorTarget const* Target;
const std::string Property; const std::string Property;
std::map<cmGeneratorTarget const*, std::set<std::string>> Seen; mutable std::map<cmGeneratorTarget const*, std::set<std::string>> Seen;
const GeneratorExpressionContent* const Content; const GeneratorExpressionContent* const Content;
const cmListFileBacktrace Backtrace; const cmListFileBacktrace Backtrace;
Result CheckResult; Result CheckResult;
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment