diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-01-01 15:49:05 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-01-06 17:25:10 +0100 |
| commit | faedd2bea9c98fddd9e9f70deebdb53f8f369124 (patch) | |
| tree | 9bd680db2dfc528aa600494acb4f865e5fe31e1e /Source/cmGeneratorExpressionDAGChecker.cxx | |
| parent | 9eb06d0dde52203d3f8ac91ea9a1c5396a09f8af (diff) | |
| download | cmake-faedd2bea9c98fddd9e9f70deebdb53f8f369124.tar.gz | |
cmTarget: Fix system include annotation propagation.
Direct users of IMPORTED targets treat INTERFACE_INCLUDE_DIRECTORIES
as SYSTEM, after commit a63fcbcb (Always consider includes from IMPORTED
targets to be SYSTEM., 2013-08-29). It was intended that transitive
use of an IMPORTED target would have the same behavior, but that
did not work. The implementation processed only direct dependencies
in cmTarget::FinalizeSystemIncludeDirectories.
Implement transitive evaluation of dependencies by traversing the
link interface of each target in the link implementation.
Diffstat (limited to 'Source/cmGeneratorExpressionDAGChecker.cxx')
| -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 84d7735b27..c2c4e20f4f 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -192,7 +192,8 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingSystemIncludeDirectories() const { const char *prop = this->Property.c_str(); - return strcmp(prop, "INTERFACE_SYSTEM_INCLUDE_DIRECTORIES") == 0; + return (strcmp(prop, "SYSTEM_INCLUDE_DIRECTORIES") == 0 + || strcmp(prop, "INTERFACE_SYSTEM_INCLUDE_DIRECTORIES") == 0); } //---------------------------------------------------------------------------- |