diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-22 12:14:11 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-02-22 12:29:32 (GMT) |
| commit | d899eb71b52616c9e3f3f5987f229619605e632b (patch) | |
| tree | 755fb95dcbcacd878ee4a45d326f317a22f7a72f | |
| parent | c21db870a5912015a3fe64753a7df49318ceff1e (diff) | |
| download | CMake-d899eb71b52616c9e3f3f5987f229619605e632b.zip CMake-d899eb71b52616c9e3f3f5987f229619605e632b.tar.gz CMake-d899eb71b52616c9e3f3f5987f229619605e632b.tar.bz2 | |
Call ExpandVariablesInString for each target's INCLUDE_DIRECTORIES
For strict backwards compatibility only. This should be unnecessary at
this point, but introducing a policy to deprecate it properly is a
whole different topic branch...
| -rw-r--r-- | Source/cmMakefile.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 818bb1b..84dc872 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2127,6 +2127,20 @@ void cmMakefile::ExpandVariables() this->SetProperty("INCLUDE_DIRECTORIES", dirs.c_str()); } + // Also for each target's INCLUDE_DIRECTORIES property: + for (cmTargets::iterator l = this->Targets.begin(); + l != this->Targets.end(); ++l) + { + cmTarget &t = l->second; + const char *includeDirs = t.GetProperty("INCLUDE_DIRECTORIES"); + if (includeDirs) + { + std::string dirs = includeDirs; + this->ExpandVariablesInString(dirs, true, true); + t.SetProperty("INCLUDE_DIRECTORIES", dirs.c_str()); + } + } + for(std::vector<std::string>::iterator d = this->LinkDirectories.begin(); d != this->LinkDirectories.end(); ++d) { |