From d899eb71b52616c9e3f3f5987f229619605e632b Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 22 Feb 2012 07:14:11 -0500 Subject: 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... --- Source/cmMakefile.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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::iterator d = this->LinkDirectories.begin(); d != this->LinkDirectories.end(); ++d) { -- cgit v0.12