From 6c4368ddbd52ee6fc9264aaeacbc6e3f9f8d4fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@laposte.net>
Date: Tue, 28 Jun 2011 19:02:12 +0200
Subject: [PATCH] Implements raw replacement for IMPLICIT_DEPENDS_INCLUDE_TRANSFORM target property

---
 Source/cmDependsC.cxx | 1167 +++++++++++++++++++++++++------------------------
 Source/cmDependsC.h   |  204 +++++-----
 2 files changed, 694 insertions(+), 677 deletions(-)

diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index a76b3af..087e357 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -1,578 +1,589 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#include "cmDependsC.h"
-
-#include "cmFileTimeComparison.h"
-#include "cmLocalGenerator.h"
-#include "cmMakefile.h"
-#include "cmSystemTools.h"
-
-#include <ctype.h> // isspace
-
-
-#define INCLUDE_REGEX_LINE \
-  "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
-
-#define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: "
-#define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: "
-#define INCLUDE_REGEX_COMPLAIN_MARKER "#IncludeRegexComplain: "
-#define INCLUDE_REGEX_TRANSFORM_MARKER "#IncludeRegexTransform: "
-
-//----------------------------------------------------------------------------
-cmDependsC::cmDependsC()
-: ValidDeps(0)
-{
-}
-
-//----------------------------------------------------------------------------
-cmDependsC::cmDependsC(cmLocalGenerator* lg,
-                   const char* targetDir,
-                   const char* lang,
-                   const std::map<std::string, DependencyVector>* validDeps)
-: cmDepends(lg, targetDir)
-, ValidDeps(validDeps)
-{
-  cmMakefile* mf = lg->GetMakefile();
-
-  // Configure the include file search path.
-  this->SetIncludePathFromLanguage(lang);
-
-  // Configure regular expressions.
-  std::string scanRegex = "^.*$";
-  std::string complainRegex = "^$";
-  {
-  std::string scanRegexVar = "CMAKE_";
-  scanRegexVar += lang;
-  scanRegexVar += "_INCLUDE_REGEX_SCAN";
-  if(const char* sr = mf->GetDefinition(scanRegexVar.c_str()))
-    {
-    scanRegex = sr;
-    }
-  std::string complainRegexVar = "CMAKE_";
-  complainRegexVar += lang;
-  complainRegexVar += "_INCLUDE_REGEX_COMPLAIN";
-  if(const char* cr = mf->GetDefinition(complainRegexVar.c_str()))
-    {
-    complainRegex = cr;
-    }
-  }
-
-  this->IncludeRegexLine.compile(INCLUDE_REGEX_LINE);
-  this->IncludeRegexScan.compile(scanRegex.c_str());
-  this->IncludeRegexComplain.compile(complainRegex.c_str());
-  this->IncludeRegexLineString = INCLUDE_REGEX_LINE_MARKER INCLUDE_REGEX_LINE;
-  this->IncludeRegexScanString = INCLUDE_REGEX_SCAN_MARKER;
-  this->IncludeRegexScanString += scanRegex;
-  this->IncludeRegexComplainString = INCLUDE_REGEX_COMPLAIN_MARKER;
-  this->IncludeRegexComplainString += complainRegex;
-
-  this->SetupTransforms();
-
-  this->CacheFileName = this->TargetDirectory;
-  this->CacheFileName += "/";
-  this->CacheFileName += lang;
-  this->CacheFileName += ".includecache";
-
-  this->ReadCacheFile();
-}
-
-//----------------------------------------------------------------------------
-cmDependsC::~cmDependsC()
-{
-  this->WriteCacheFile();
-
-  for (std::map<cmStdString, cmIncludeLines*>::iterator it=
-         this->FileCache.begin(); it!=this->FileCache.end(); ++it)
-    {
-    delete it->second;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool cmDependsC::WriteDependencies(const char *src, const char *obj,
-  std::ostream& makeDepends, std::ostream& internalDepends)
-{
-  // Make sure this is a scanning instance.
-  if(!src || src[0] == '\0')
-    {
-    cmSystemTools::Error("Cannot scan dependencies without a source file.");
-    return false;
-    }
-  if(!obj || obj[0] == '\0')
-    {
-    cmSystemTools::Error("Cannot scan dependencies without an object file.");
-    return false;
-    }
-
-  if (this->ValidDeps != 0)
-    {
-    std::map<std::string, DependencyVector>::const_iterator tmpIt =
-                                                    this->ValidDeps->find(obj);
-    if (tmpIt!= this->ValidDeps->end())
-      {
-      // Write the dependencies to the output stream.  Makefile rules
-      // written by the original local generator for this directory
-      // convert the dependencies to paths relative to the home output
-      // directory.  We must do the same here.
-      internalDepends << obj << std::endl;
-      for(DependencyVector::const_iterator i=tmpIt->second.begin();
-         i != tmpIt->second.end(); ++i)
-        {
-        makeDepends << obj << ": " <<
-           this->LocalGenerator->Convert(i->c_str(),
-                                         cmLocalGenerator::HOME_OUTPUT,
-                                         cmLocalGenerator::MAKEFILE)
-           << std::endl;
-        internalDepends << " " << i->c_str() << std::endl;
-        }
-      makeDepends << std::endl;
-      return true;
-      }
-    }
-
-  // Walk the dependency graph starting with the source file.
-  bool first = true;
-  UnscannedEntry root;
-  root.FileName = src;
-  this->Unscanned.push(root);
-  this->Encountered.clear();
-  this->Encountered.insert(src);
-  std::set<cmStdString> dependencies;
-  std::set<cmStdString> scanned;
-
-  // Use reserve to allocate enough memory for tempPathStr
-  // so that during the loops no memory is allocated or freed
-  std::string tempPathStr;
-  tempPathStr.reserve(4*1024);
-
-  while(!this->Unscanned.empty())
-    {
-    // Get the next file to scan.
-    UnscannedEntry current = this->Unscanned.front();
-    this->Unscanned.pop();
-
-    // If not a full path, find the file in the include path.
-    std::string fullName;
-    if(first || cmSystemTools::FileIsFullPath(current.FileName.c_str()))
-      {
-      if(cmSystemTools::FileExists(current.FileName.c_str(), true))
-        {
-        fullName = current.FileName;
-        }
-      }
-    else if(!current.QuotedLocation.empty() &&
-            cmSystemTools::FileExists(current.QuotedLocation.c_str(), true))
-      {
-      // The include statement producing this entry was a double-quote
-      // include and the included file is present in the directory of
-      // the source containing the include statement.
-      fullName = current.QuotedLocation;
-      }
-    else
-      {
-      std::map<cmStdString, cmStdString>::iterator
-        headerLocationIt=this->HeaderLocationCache.find(current.FileName);
-      if (headerLocationIt!=this->HeaderLocationCache.end())
-        {
-        fullName=headerLocationIt->second;
-        }
-      else for(std::vector<std::string>::const_iterator i =
-            this->IncludePath.begin(); i != this->IncludePath.end(); ++i)
-        {
-        // Construct the name of the file as if it were in the current
-        // include directory.  Avoid using a leading "./".
-
-        tempPathStr = "";
-        if((*i) == ".")
-          {
-          tempPathStr += current.FileName;
-          }
-        else
-          {
-          tempPathStr += *i;
-          tempPathStr+="/";
-          tempPathStr+=current.FileName;
-          }
-
-        // Look for the file in this location.
-        if(cmSystemTools::FileExists(tempPathStr.c_str(), true))
-          {
-          fullName = tempPathStr;
-          HeaderLocationCache[current.FileName]=fullName;
-          break;
-          }
-        }
-      }
-
-    // Complain if the file cannot be found and matches the complain
-    // regex.
-    if(fullName.empty() &&
-       this->IncludeRegexComplain.find(current.FileName.c_str()))
-      {
-      cmSystemTools::Error("Cannot find file \"",
-                           current.FileName.c_str(), "\".");
-      return false;
-      }
-
-    // Scan the file if it was found and has not been scanned already.
-    if(!fullName.empty() && (scanned.find(fullName) == scanned.end()))
-      {
-      // Record scanned files.
-      scanned.insert(fullName);
-
-      // Check whether this file is already in the cache
-      std::map<cmStdString, cmIncludeLines*>::iterator fileIt=
-        this->FileCache.find(fullName);
-      if (fileIt!=this->FileCache.end())
-        {
-        fileIt->second->Used=true;
-        dependencies.insert(fullName);
-        for (std::vector<UnscannedEntry>::const_iterator incIt=
-               fileIt->second->UnscannedEntries.begin(); 
-             incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
-          {
-          if (this->Encountered.find(incIt->FileName) == 
-              this->Encountered.end())
-            {
-            this->Encountered.insert(incIt->FileName);
-            this->Unscanned.push(*incIt);
-            }
-          }
-        }
-      else
-        {
-
-        // Try to scan the file.  Just leave it out if we cannot find
-        // it.
-        std::ifstream fin(fullName.c_str());
-        if(fin)
-          {
-          // Add this file as a dependency.
-          dependencies.insert(fullName);
-
-          // Scan this file for new dependencies.  Pass the directory
-          // containing the file to handle double-quote includes.
-          std::string dir = cmSystemTools::GetFilenamePath(fullName);
-          this->Scan(fin, dir.c_str(), fullName);
-          }
-        }
-      }
-
-    first = false;
-    }
-
-  // Write the dependencies to the output stream.  Makefile rules
-  // written by the original local generator for this directory
-  // convert the dependencies to paths relative to the home output
-  // directory.  We must do the same here.
-  internalDepends << obj << std::endl;
-  for(std::set<cmStdString>::iterator i=dependencies.begin();
-      i != dependencies.end(); ++i)
-    {
-    makeDepends << obj << ": " << 
-      this->LocalGenerator->Convert(i->c_str(),
-                                    cmLocalGenerator::HOME_OUTPUT,
-                                    cmLocalGenerator::MAKEFILE)
-                << std::endl;
-    internalDepends << " " << i->c_str() << std::endl;
-    }
-  makeDepends << std::endl;
-
-  return true;
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::ReadCacheFile()
-{
-  if(this->CacheFileName.size() == 0)
-    {
-    return;
-    }
-  std::ifstream fin(this->CacheFileName.c_str());
-  if(!fin)
-    {
-    return;
-    }
-
-  std::string line;
-  cmIncludeLines* cacheEntry=0;
-  bool haveFileName=false;
-
-  while(cmSystemTools::GetLineFromStream(fin, line))
-    {
-    if (line.empty())
-      {
-      cacheEntry=0;
-      haveFileName=false;
-      continue;
-      }
-    //the first line after an empty line is the name of the parsed file
-    if (haveFileName==false)
-      {
-      haveFileName=true;
-      int newer=0;
-      cmFileTimeComparison comp;
-      bool res=comp.FileTimeCompare(this->CacheFileName.c_str(), 
-                                    line.c_str(), &newer);
-      
-      if ((res==true) && (newer==1)) //cache is newer than the parsed file
-        {
-        cacheEntry=new cmIncludeLines;
-        this->FileCache[line]=cacheEntry;
-        }
-      // file doesn't exist, check that the regular expressions
-      // haven't changed
-      else if (res==false)
-        {
-        if (line.find(INCLUDE_REGEX_LINE_MARKER) == 0)
-          {
-          if (line != this->IncludeRegexLineString)
-            {
-            return;
-            }
-          }
-        else if (line.find(INCLUDE_REGEX_SCAN_MARKER) == 0)
-          {
-          if (line != this->IncludeRegexScanString)
-            {
-            return;
-            }
-          }
-        else if (line.find(INCLUDE_REGEX_COMPLAIN_MARKER) == 0)
-          {
-          if (line != this->IncludeRegexComplainString)
-            {
-            return;
-            }
-          }
-        else if (line.find(INCLUDE_REGEX_TRANSFORM_MARKER) == 0)
-          {
-          if (line != this->IncludeRegexTransformString)
-            {
-            return;
-            }
-          }
-        }
-      }
-    else if (cacheEntry!=0)
-      {
-      UnscannedEntry entry;
-      entry.FileName = line;
-      if (cmSystemTools::GetLineFromStream(fin, line))
-        {
-        if (line!="-")
-          {
-          entry.QuotedLocation=line;
-          }
-        cacheEntry->UnscannedEntries.push_back(entry);
-        }
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::WriteCacheFile() const
-{
-  if(this->CacheFileName.size() == 0)
-    {
-    return;
-    }
-  std::ofstream cacheOut(this->CacheFileName.c_str());
-  if(!cacheOut)
-    {
-    return;
-    }
-  
-  cacheOut << this->IncludeRegexLineString << "\n\n";
-  cacheOut << this->IncludeRegexScanString << "\n\n";
-  cacheOut << this->IncludeRegexComplainString << "\n\n";
-  cacheOut << this->IncludeRegexTransformString << "\n\n";
-
-  for (std::map<cmStdString, cmIncludeLines*>::const_iterator fileIt=
-         this->FileCache.begin();
-       fileIt!=this->FileCache.end(); ++fileIt)
-    {
-    if (fileIt->second->Used)
-      {
-      cacheOut<<fileIt->first.c_str()<<std::endl;
-
-      for (std::vector<UnscannedEntry>::const_iterator
-             incIt=fileIt->second->UnscannedEntries.begin(); 
-           incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
-        {
-        cacheOut<<incIt->FileName.c_str()<<std::endl;
-        if (incIt->QuotedLocation.empty())
-          {
-          cacheOut<<"-"<<std::endl;
-          }
-        else
-          {
-          cacheOut<<incIt->QuotedLocation.c_str()<<std::endl;
-          }
-        }
-      cacheOut<<std::endl;
-      }
-   }
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::Scan(std::istream& is, const char* directory,
-  const cmStdString& fullName)
-{
-  cmIncludeLines* newCacheEntry=new cmIncludeLines;
-  newCacheEntry->Used=true;
-  this->FileCache[fullName]=newCacheEntry;
-  
-  // Read one line at a time.
-  std::string line;
-  while(cmSystemTools::GetLineFromStream(is, line))
-    {
-    // Transform the line content first.
-    if(!this->TransformRules.empty())
-      {
-      this->TransformLine(line);
-      }
-
-    // Match include directives.
-    if(this->IncludeRegexLine.find(line.c_str()))
-      {
-      // Get the file being included.
-      UnscannedEntry entry;
-      entry.FileName = this->IncludeRegexLine.match(2);
-      cmSystemTools::ConvertToUnixSlashes(entry.FileName);
-      if(this->IncludeRegexLine.match(3) == "\"" &&
-         !cmSystemTools::FileIsFullPath(entry.FileName.c_str()))
-        {
-        // This was a double-quoted include with a relative path.  We
-        // must check for the file in the directory containing the
-        // file we are scanning.
-        entry.QuotedLocation = directory;
-        entry.QuotedLocation += "/";
-        entry.QuotedLocation += entry.FileName;
-        }
-
-      // Queue the file if it has not yet been encountered and it
-      // matches the regular expression for recursive scanning.  Note
-      // that this check does not account for the possibility of two
-      // headers with the same name in different directories when one
-      // is included by double-quotes and the other by angle brackets.
-      // This kind of problem will be fixed when a more
-      // preprocessor-like implementation of this scanner is created.
-      if (this->IncludeRegexScan.find(entry.FileName.c_str()))
-        {
-        newCacheEntry->UnscannedEntries.push_back(entry);
-        if(this->Encountered.find(entry.FileName) == this->Encountered.end())
-          {
-          this->Encountered.insert(entry.FileName);
-          this->Unscanned.push(entry);
-          }
-        }
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::SetupTransforms()
-{
-  // Get the transformation rules.
-  std::vector<std::string> transformRules;
-  cmMakefile* mf = this->LocalGenerator->GetMakefile();
-  if(const char* xform =
-     mf->GetDefinition("CMAKE_INCLUDE_TRANSFORMS"))
-    {
-    cmSystemTools::ExpandListArgument(xform, transformRules, true);
-    }
-  for(std::vector<std::string>::const_iterator tri = transformRules.begin();
-      tri != transformRules.end(); ++tri)
-    {
-    this->ParseTransform(*tri);
-    }
-
-  this->IncludeRegexTransformString = INCLUDE_REGEX_TRANSFORM_MARKER;
-  if(!this->TransformRules.empty())
-    {
-    // Construct the regular expression to match lines to be
-    // transformed.
-    std::string xform = "^([ \t]*#[ \t]*(include|import)[ \t]*)(";
-    const char* sep = "";
-    for(TransformRulesType::const_iterator tri = this->TransformRules.begin();
-        tri != this->TransformRules.end(); ++tri)
-      {
-      xform += sep;
-      xform += tri->first;
-      sep = "|";
-      }
-    xform += ")[ \t]*\\(([^),]*)\\)";
-    this->IncludeRegexTransform.compile(xform.c_str());
-
-    // Build a string that encodes all transformation rules and will
-    // change when rules are changed.
-    this->IncludeRegexTransformString += xform;
-    for(TransformRulesType::const_iterator tri = this->TransformRules.begin();
-        tri != this->TransformRules.end(); ++tri)
-      {
-      this->IncludeRegexTransformString += " ";
-      this->IncludeRegexTransformString += tri->first;
-      this->IncludeRegexTransformString += "(%)=";
-      this->IncludeRegexTransformString += tri->second;
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::ParseTransform(std::string const& xform)
-{
-  // A transform rule is of the form SOME_MACRO(%)=value-with-%
-  // We can simply separate with "(%)=".
-  std::string::size_type pos = xform.find("(%)=");
-  if(pos == xform.npos || pos == 0)
-    {
-    return;
-    }
-  std::string name = xform.substr(0, pos);
-  std::string value = xform.substr(pos+4, xform.npos);
-  this->TransformRules[name] = value;
-}
-
-//----------------------------------------------------------------------------
-void cmDependsC::TransformLine(std::string& line)
-{
-  // Check for a transform rule match.  Return if none.
-  if(!this->IncludeRegexTransform.find(line.c_str()))
-    {
-    return;
-    }
-  TransformRulesType::const_iterator tri =
-    this->TransformRules.find(this->IncludeRegexTransform.match(3));
-  if(tri == this->TransformRules.end())
-    {
-    return;
-    }
-
-  // Construct the transformed line.
-  std::string newline = this->IncludeRegexTransform.match(1);
-  std::string arg = this->IncludeRegexTransform.match(4);
-  for(const char* c = tri->second.c_str(); *c; ++c)
-    {
-    if(*c == '%')
-      {
-      newline += arg;
-      }
-    else
-      {
-      newline += *c;
-      }
-    }
-
-  // Return the transformed line.
-  line = newline;
-}
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+#include "cmDependsC.h"
+
+#include "cmFileTimeComparison.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+
+#include <ctype.h> // isspace
+
+
+#define INCLUDE_REGEX_LINE \
+  "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
+
+#define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: "
+#define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: "
+#define INCLUDE_REGEX_COMPLAIN_MARKER "#IncludeRegexComplain: "
+#define INCLUDE_REGEX_TRANSFORM_MARKER "#IncludeRegexTransform: "
+
+//----------------------------------------------------------------------------
+cmDependsC::cmDependsC()
+: ValidDeps(0)
+{
+}
+
+//----------------------------------------------------------------------------
+cmDependsC::cmDependsC(cmLocalGenerator* lg,
+                   const char* targetDir,
+                   const char* lang,
+                   const std::map<std::string, DependencyVector>* validDeps)
+: cmDepends(lg, targetDir)
+, ValidDeps(validDeps)
+{
+  cmMakefile* mf = lg->GetMakefile();
+
+  // Configure the include file search path.
+  this->SetIncludePathFromLanguage(lang);
+
+  // Configure regular expressions.
+  std::string scanRegex = "^.*$";
+  std::string complainRegex = "^$";
+  {
+  std::string scanRegexVar = "CMAKE_";
+  scanRegexVar += lang;
+  scanRegexVar += "_INCLUDE_REGEX_SCAN";
+  if(const char* sr = mf->GetDefinition(scanRegexVar.c_str()))
+    {
+    scanRegex = sr;
+    }
+  std::string complainRegexVar = "CMAKE_";
+  complainRegexVar += lang;
+  complainRegexVar += "_INCLUDE_REGEX_COMPLAIN";
+  if(const char* cr = mf->GetDefinition(complainRegexVar.c_str()))
+    {
+    complainRegex = cr;
+    }
+  }
+
+  this->IncludeRegexLine.compile(INCLUDE_REGEX_LINE);
+  this->IncludeRegexScan.compile(scanRegex.c_str());
+  this->IncludeRegexComplain.compile(complainRegex.c_str());
+  this->IncludeRegexLineString = INCLUDE_REGEX_LINE_MARKER INCLUDE_REGEX_LINE;
+  this->IncludeRegexScanString = INCLUDE_REGEX_SCAN_MARKER;
+  this->IncludeRegexScanString += scanRegex;
+  this->IncludeRegexComplainString = INCLUDE_REGEX_COMPLAIN_MARKER;
+  this->IncludeRegexComplainString += complainRegex;
+
+  this->SetupTransforms();
+
+  this->CacheFileName = this->TargetDirectory;
+  this->CacheFileName += "/";
+  this->CacheFileName += lang;
+  this->CacheFileName += ".includecache";
+
+  this->ReadCacheFile();
+}
+
+//----------------------------------------------------------------------------
+cmDependsC::~cmDependsC()
+{
+  this->WriteCacheFile();
+
+  for (std::map<cmStdString, cmIncludeLines*>::iterator it=
+         this->FileCache.begin(); it!=this->FileCache.end(); ++it)
+    {
+    delete it->second;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool cmDependsC::WriteDependencies(const char *src, const char *obj,
+  std::ostream& makeDepends, std::ostream& internalDepends)
+{
+  // Make sure this is a scanning instance.
+  if(!src || src[0] == '\0')
+    {
+    cmSystemTools::Error("Cannot scan dependencies without a source file.");
+    return false;
+    }
+  if(!obj || obj[0] == '\0')
+    {
+    cmSystemTools::Error("Cannot scan dependencies without an object file.");
+    return false;
+    }
+
+  if (this->ValidDeps != 0)
+    {
+    std::map<std::string, DependencyVector>::const_iterator tmpIt =
+                                                    this->ValidDeps->find(obj);
+    if (tmpIt!= this->ValidDeps->end())
+      {
+      // Write the dependencies to the output stream.  Makefile rules
+      // written by the original local generator for this directory
+      // convert the dependencies to paths relative to the home output
+      // directory.  We must do the same here.
+      internalDepends << obj << std::endl;
+      for(DependencyVector::const_iterator i=tmpIt->second.begin();
+         i != tmpIt->second.end(); ++i)
+        {
+        makeDepends << obj << ": " <<
+           this->LocalGenerator->Convert(i->c_str(),
+                                         cmLocalGenerator::HOME_OUTPUT,
+                                         cmLocalGenerator::MAKEFILE)
+           << std::endl;
+        internalDepends << " " << i->c_str() << std::endl;
+        }
+      makeDepends << std::endl;
+      return true;
+      }
+    }
+
+  // Walk the dependency graph starting with the source file.
+  bool first = true;
+  UnscannedEntry root;
+  root.FileName = src;
+  this->Unscanned.push(root);
+  this->Encountered.clear();
+  this->Encountered.insert(src);
+  std::set<cmStdString> dependencies;
+  std::set<cmStdString> scanned;
+
+  // Use reserve to allocate enough memory for tempPathStr
+  // so that during the loops no memory is allocated or freed
+  std::string tempPathStr;
+  tempPathStr.reserve(4*1024);
+
+  while(!this->Unscanned.empty())
+    {
+    // Get the next file to scan.
+    UnscannedEntry current = this->Unscanned.front();
+    this->Unscanned.pop();
+
+    // If not a full path, find the file in the include path.
+    std::string fullName;
+    if(first || cmSystemTools::FileIsFullPath(current.FileName.c_str()))
+      {
+      if(cmSystemTools::FileExists(current.FileName.c_str(), true))
+        {
+        fullName = current.FileName;
+        }
+      }
+    else if(!current.QuotedLocation.empty() &&
+            cmSystemTools::FileExists(current.QuotedLocation.c_str(), true))
+      {
+      // The include statement producing this entry was a double-quote
+      // include and the included file is present in the directory of
+      // the source containing the include statement.
+      fullName = current.QuotedLocation;
+      }
+    else
+      {
+      std::map<cmStdString, cmStdString>::iterator
+        headerLocationIt=this->HeaderLocationCache.find(current.FileName);
+      if (headerLocationIt!=this->HeaderLocationCache.end())
+        {
+        fullName=headerLocationIt->second;
+        }
+      else for(std::vector<std::string>::const_iterator i =
+            this->IncludePath.begin(); i != this->IncludePath.end(); ++i)
+        {
+        // Construct the name of the file as if it were in the current
+        // include directory.  Avoid using a leading "./".
+
+        tempPathStr = "";
+        if((*i) == ".")
+          {
+          tempPathStr += current.FileName;
+          }
+        else
+          {
+          tempPathStr += *i;
+          tempPathStr+="/";
+          tempPathStr+=current.FileName;
+          }
+
+        // Look for the file in this location.
+        if(cmSystemTools::FileExists(tempPathStr.c_str(), true))
+          {
+          fullName = tempPathStr;
+          HeaderLocationCache[current.FileName]=fullName;
+          break;
+          }
+        }
+      }
+
+    // Complain if the file cannot be found and matches the complain
+    // regex.
+    if(fullName.empty() &&
+       this->IncludeRegexComplain.find(current.FileName.c_str()))
+      {
+      cmSystemTools::Error("Cannot find file \"",
+                           current.FileName.c_str(), "\".");
+      return false;
+      }
+
+    // Scan the file if it was found and has not been scanned already.
+    if(!fullName.empty() && (scanned.find(fullName) == scanned.end()))
+      {
+      // Record scanned files.
+      scanned.insert(fullName);
+
+      // Check whether this file is already in the cache
+      std::map<cmStdString, cmIncludeLines*>::iterator fileIt=
+        this->FileCache.find(fullName);
+      if (fileIt!=this->FileCache.end())
+        {
+        fileIt->second->Used=true;
+        dependencies.insert(fullName);
+        for (std::vector<UnscannedEntry>::const_iterator incIt=
+               fileIt->second->UnscannedEntries.begin(); 
+             incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
+          {
+          if (this->Encountered.find(incIt->FileName) == 
+              this->Encountered.end())
+            {
+            this->Encountered.insert(incIt->FileName);
+            this->Unscanned.push(*incIt);
+            }
+          }
+        }
+      else
+        {
+
+        // Try to scan the file.  Just leave it out if we cannot find
+        // it.
+        std::ifstream fin(fullName.c_str());
+        if(fin)
+          {
+          // Add this file as a dependency.
+          dependencies.insert(fullName);
+
+          // Scan this file for new dependencies.  Pass the directory
+          // containing the file to handle double-quote includes.
+          std::string dir = cmSystemTools::GetFilenamePath(fullName);
+          this->Scan(fin, dir.c_str(), fullName);
+          }
+        }
+      }
+
+    first = false;
+    }
+
+  // Write the dependencies to the output stream.  Makefile rules
+  // written by the original local generator for this directory
+  // convert the dependencies to paths relative to the home output
+  // directory.  We must do the same here.
+  internalDepends << obj << std::endl;
+  for(std::set<cmStdString>::iterator i=dependencies.begin();
+      i != dependencies.end(); ++i)
+    {
+    makeDepends << obj << ": " << 
+      this->LocalGenerator->Convert(i->c_str(),
+                                    cmLocalGenerator::HOME_OUTPUT,
+                                    cmLocalGenerator::MAKEFILE)
+                << std::endl;
+    internalDepends << " " << i->c_str() << std::endl;
+    }
+  makeDepends << std::endl;
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::ReadCacheFile()
+{
+  if(this->CacheFileName.size() == 0)
+    {
+    return;
+    }
+  std::ifstream fin(this->CacheFileName.c_str());
+  if(!fin)
+    {
+    return;
+    }
+
+  std::string line;
+  cmIncludeLines* cacheEntry=0;
+  bool haveFileName=false;
+
+  while(cmSystemTools::GetLineFromStream(fin, line))
+    {
+    if (line.empty())
+      {
+      cacheEntry=0;
+      haveFileName=false;
+      continue;
+      }
+    //the first line after an empty line is the name of the parsed file
+    if (haveFileName==false)
+      {
+      haveFileName=true;
+      int newer=0;
+      cmFileTimeComparison comp;
+      bool res=comp.FileTimeCompare(this->CacheFileName.c_str(), 
+                                    line.c_str(), &newer);
+      
+      if ((res==true) && (newer==1)) //cache is newer than the parsed file
+        {
+        cacheEntry=new cmIncludeLines;
+        this->FileCache[line]=cacheEntry;
+        }
+      // file doesn't exist, check that the regular expressions
+      // haven't changed
+      else if (res==false)
+        {
+        if (line.find(INCLUDE_REGEX_LINE_MARKER) == 0)
+          {
+          if (line != this->IncludeRegexLineString)
+            {
+            return;
+            }
+          }
+        else if (line.find(INCLUDE_REGEX_SCAN_MARKER) == 0)
+          {
+          if (line != this->IncludeRegexScanString)
+            {
+            return;
+            }
+          }
+        else if (line.find(INCLUDE_REGEX_COMPLAIN_MARKER) == 0)
+          {
+          if (line != this->IncludeRegexComplainString)
+            {
+            return;
+            }
+          }
+        else if (line.find(INCLUDE_REGEX_TRANSFORM_MARKER) == 0)
+          {
+          if (line != this->IncludeRegexTransformString)
+            {
+            return;
+            }
+          }
+        }
+      }
+    else if (cacheEntry!=0)
+      {
+      UnscannedEntry entry;
+      entry.FileName = line;
+      if (cmSystemTools::GetLineFromStream(fin, line))
+        {
+        if (line!="-")
+          {
+          entry.QuotedLocation=line;
+          }
+        cacheEntry->UnscannedEntries.push_back(entry);
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::WriteCacheFile() const
+{
+  if(this->CacheFileName.size() == 0)
+    {
+    return;
+    }
+  std::ofstream cacheOut(this->CacheFileName.c_str());
+  if(!cacheOut)
+    {
+    return;
+    }
+  
+  cacheOut << this->IncludeRegexLineString << "\n\n";
+  cacheOut << this->IncludeRegexScanString << "\n\n";
+  cacheOut << this->IncludeRegexComplainString << "\n\n";
+  cacheOut << this->IncludeRegexTransformString << "\n\n";
+
+  for (std::map<cmStdString, cmIncludeLines*>::const_iterator fileIt=
+         this->FileCache.begin();
+       fileIt!=this->FileCache.end(); ++fileIt)
+    {
+    if (fileIt->second->Used)
+      {
+      cacheOut<<fileIt->first.c_str()<<std::endl;
+
+      for (std::vector<UnscannedEntry>::const_iterator
+             incIt=fileIt->second->UnscannedEntries.begin(); 
+           incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
+        {
+        cacheOut<<incIt->FileName.c_str()<<std::endl;
+        if (incIt->QuotedLocation.empty())
+          {
+          cacheOut<<"-"<<std::endl;
+          }
+        else
+          {
+          cacheOut<<incIt->QuotedLocation.c_str()<<std::endl;
+          }
+        }
+      cacheOut<<std::endl;
+      }
+   }
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::Scan(std::istream& is, const char* directory,
+  const cmStdString& fullName)
+{
+  cmIncludeLines* newCacheEntry=new cmIncludeLines;
+  newCacheEntry->Used=true;
+  this->FileCache[fullName]=newCacheEntry;
+  
+  // Read one line at a time.
+  std::string line;
+  while(cmSystemTools::GetLineFromStream(is, line))
+    {
+    // Transform the line content first.
+    if(!this->TransformRules.empty())
+      {
+      this->TransformLine(line);
+      }
+
+    // Match include directives.
+    if(this->IncludeRegexLine.find(line.c_str()))
+      {
+      // Get the file being included.
+      UnscannedEntry entry;
+      entry.FileName = this->IncludeRegexLine.match(2);
+      cmSystemTools::ConvertToUnixSlashes(entry.FileName);
+      if(this->IncludeRegexLine.match(3) == "\"" &&
+         !cmSystemTools::FileIsFullPath(entry.FileName.c_str()))
+        {
+        // This was a double-quoted include with a relative path.  We
+        // must check for the file in the directory containing the
+        // file we are scanning.
+        entry.QuotedLocation = directory;
+        entry.QuotedLocation += "/";
+        entry.QuotedLocation += entry.FileName;
+        }
+
+      // Queue the file if it has not yet been encountered and it
+      // matches the regular expression for recursive scanning.  Note
+      // that this check does not account for the possibility of two
+      // headers with the same name in different directories when one
+      // is included by double-quotes and the other by angle brackets.
+      // This kind of problem will be fixed when a more
+      // preprocessor-like implementation of this scanner is created.
+      if (this->IncludeRegexScan.find(entry.FileName.c_str()))
+        {
+        newCacheEntry->UnscannedEntries.push_back(entry);
+        if(this->Encountered.find(entry.FileName) == this->Encountered.end())
+          {
+          this->Encountered.insert(entry.FileName);
+          this->Unscanned.push(entry);
+          }
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::SetupTransforms()
+{
+  // Get the transformation rules.
+  std::vector<std::string> transformRules;
+  cmMakefile* mf = this->LocalGenerator->GetMakefile();
+  if(const char* xform =
+     mf->GetDefinition("CMAKE_INCLUDE_TRANSFORMS"))
+    {
+    cmSystemTools::ExpandListArgument(xform, transformRules, true);
+    }
+  for(std::vector<std::string>::const_iterator tri = transformRules.begin();
+      tri != transformRules.end(); ++tri)
+    {
+    this->ParseTransform(*tri);
+    }
+
+  this->IncludeRegexTransformString = INCLUDE_REGEX_TRANSFORM_MARKER;
+  if(!this->TransformRules.empty())
+    {
+    // Construct the regular expression to match lines to be
+    // transformed.
+    std::string xform = "^([ \t]*#[ \t]*(include|import)[ \t]*)(";
+    const char* sep = "";
+    for(TransformRulesType::const_iterator tri = this->TransformRules.begin();
+        tri != this->TransformRules.end(); ++tri)
+      {
+      xform += sep;
+      xform += tri->first;
+      sep = "|";
+      }
+    xform += ")[ \t]*\\(?([^),]*)\\)?";
+    this->IncludeRegexTransform.compile(xform.c_str());
+
+    // Build a string that encodes all transformation rules and will
+    // change when rules are changed.
+    this->IncludeRegexTransformString += xform;
+    for(TransformRulesType::const_iterator tri = this->TransformRules.begin();
+        tri != this->TransformRules.end(); ++tri)
+      {
+      this->IncludeRegexTransformString += " ";
+      this->IncludeRegexTransformString += tri->first;
+      this->IncludeRegexTransformString += tri->second.equals;
+      this->IncludeRegexTransformString += tri->second.value;
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::ParseTransform(std::string const& xform)
+{
+  // A transform rule is of the form SOME_MACRO(%)=value-with-%
+  // We can simply separate with "(%)=".
+  std::string::size_type pos = xform.find("(%)=");
+  int substringPos = 4;
+  if(pos == xform.npos || pos == 0)
+    {
+    pos = xform.find("=");
+    substringPos = 1;
+    }
+  if(pos == xform.npos || pos == 0)
+    {
+    return;
+    }
+  std::string name = xform.substr(0, pos);
+  this->TransformRules[name].equals = xform.substr(pos, substringPos);
+  this->TransformRules[name].value = xform.substr(pos+substringPos, xform.npos);
+}
+
+//----------------------------------------------------------------------------
+void cmDependsC::TransformLine(std::string& line)
+{
+  // Check for a transform rule match.  Return if none.
+  if(!this->IncludeRegexTransform.find(line.c_str()))
+    {
+    return;
+    }
+  TransformRulesType::const_iterator tri =
+    this->TransformRules.find(this->IncludeRegexTransform.match(3));
+  if(tri == this->TransformRules.end())
+    {
+    return;
+    }
+  if(tri->second.equals == "=")
+  {
+      line.replace(line.find(tri->first),tri->first.length(), tri->second.value);
+      return;
+  }
+
+  // Construct the transformed line.
+  std::string newline = this->IncludeRegexTransform.match(1);
+  std::string arg = this->IncludeRegexTransform.match(4);
+  for(const char* c = tri->second.value.c_str(); *c; ++c)
+    {
+    if(*c == '%')
+      {
+      newline += arg;
+      }
+    else
+      {
+      newline += *c;
+      }
+    }
+
+  // Return the transformed line.
+  line = newline;
+}
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index bd9a4b7..804af6a 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -1,99 +1,105 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#ifndef cmDependsC_h
-#define cmDependsC_h
-
-#include "cmDepends.h"
-#include <cmsys/RegularExpression.hxx>
-#include <queue>
-
-/** \class cmDependsC
- * \brief Dependency scanner for C and C++ object files.
- */
-class cmDependsC: public cmDepends
-{
-public:
-  /** Checking instances need to know the build directory name and the
-      relative path from the build directory to the target file.  */
-  cmDependsC();
-  cmDependsC(cmLocalGenerator* lg, const char* targetDir, const char* lang,
-             const std::map<std::string, DependencyVector>* validDeps);
-
-  /** Virtual destructor to cleanup subclasses properly.  */
-  virtual ~cmDependsC();
-
-protected:
-  typedef std::vector<char> t_CharBuffer;
-
-  // Implement writing/checking methods required by superclass.
-  virtual bool WriteDependencies(const char *src,
-                                 const char *file,
-                                 std::ostream& makeDepends,
-                                 std::ostream& internalDepends);
-
-  // Method to scan a single file.
-  void Scan(std::istream& is, const char* directory,
-    const cmStdString& fullName);
-
-  // Regular expression to identify C preprocessor include directives.
-  cmsys::RegularExpression IncludeRegexLine;
-
-  // Regular expressions to choose which include files to scan
-  // recursively and which to complain about not finding.
-  cmsys::RegularExpression IncludeRegexScan;
-  cmsys::RegularExpression IncludeRegexComplain;
-  std::string IncludeRegexLineString;
-  std::string IncludeRegexScanString;
-  std::string IncludeRegexComplainString;
-
-  // Regex to transform #include lines.
-  std::string IncludeRegexTransformString;
-  cmsys::RegularExpression IncludeRegexTransform;
-  typedef std::map<cmStdString, cmStdString> TransformRulesType;
-  TransformRulesType TransformRules;
-  void SetupTransforms();
-  void ParseTransform(std::string const& xform);
-  void TransformLine(std::string& line);
-
-public:
-  // Data structures for dependency graph walk.
-  struct UnscannedEntry
-  {
-    cmStdString FileName;
-    cmStdString QuotedLocation;
-  };
-
-  struct cmIncludeLines
-  {
-    cmIncludeLines(): Used(false) {}
-    std::vector<UnscannedEntry> UnscannedEntries;
-    bool Used;
-  };
-protected:
-  const std::map<std::string, DependencyVector>* ValidDeps;
-  std::set<cmStdString> Encountered;
-  std::queue<UnscannedEntry> Unscanned;
-  t_CharBuffer Buffer;
-
-  std::map<cmStdString, cmIncludeLines *> FileCache;
-  std::map<cmStdString, cmStdString> HeaderLocationCache;
-
-  cmStdString CacheFileName;
-
-  void WriteCacheFile() const;
-  void ReadCacheFile();
-private:
-  cmDependsC(cmDependsC const&); // Purposely not implemented.
-  void operator=(cmDependsC const&); // Purposely not implemented.
-};
-
-#endif
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+#ifndef cmDependsC_h
+#define cmDependsC_h
+
+#include "cmDepends.h"
+#include <cmsys/RegularExpression.hxx>
+#include <queue>
+
+/** \class cmDependsC
+ * \brief Dependency scanner for C and C++ object files.
+ */
+class cmDependsC: public cmDepends
+{
+public:
+  /** Checking instances need to know the build directory name and the
+      relative path from the build directory to the target file.  */
+  cmDependsC();
+  cmDependsC(cmLocalGenerator* lg, const char* targetDir, const char* lang,
+             const std::map<std::string, DependencyVector>* validDeps);
+
+  /** Virtual destructor to cleanup subclasses properly.  */
+  virtual ~cmDependsC();
+
+protected:
+  typedef std::vector<char> t_CharBuffer;
+
+  // Implement writing/checking methods required by superclass.
+  virtual bool WriteDependencies(const char *src,
+                                 const char *file,
+                                 std::ostream& makeDepends,
+                                 std::ostream& internalDepends);
+
+  // Method to scan a single file.
+  void Scan(std::istream& is, const char* directory,
+    const cmStdString& fullName);
+
+  // Regular expression to identify C preprocessor include directives.
+  cmsys::RegularExpression IncludeRegexLine;
+
+  // Regular expressions to choose which include files to scan
+  // recursively and which to complain about not finding.
+  cmsys::RegularExpression IncludeRegexScan;
+  cmsys::RegularExpression IncludeRegexComplain;
+  std::string IncludeRegexLineString;
+  std::string IncludeRegexScanString;
+  std::string IncludeRegexComplainString;
+
+  // Regex to transform #include lines.
+  std::string IncludeRegexTransformString;
+  cmsys::RegularExpression IncludeRegexTransform;
+  class TransformRule
+  {
+  public:
+      cmStdString equals;
+      cmStdString value;
+  };
+  typedef std::map<cmStdString, TransformRule> TransformRulesType;
+  TransformRulesType TransformRules;
+  void SetupTransforms();
+  void ParseTransform(std::string const& xform);
+  void TransformLine(std::string& line);
+
+public:
+  // Data structures for dependency graph walk.
+  struct UnscannedEntry
+  {
+    cmStdString FileName;
+    cmStdString QuotedLocation;
+  };
+
+  struct cmIncludeLines
+  {
+    cmIncludeLines(): Used(false) {}
+    std::vector<UnscannedEntry> UnscannedEntries;
+    bool Used;
+  };
+protected:
+  const std::map<std::string, DependencyVector>* ValidDeps;
+  std::set<cmStdString> Encountered;
+  std::queue<UnscannedEntry> Unscanned;
+  t_CharBuffer Buffer;
+
+  std::map<cmStdString, cmIncludeLines *> FileCache;
+  std::map<cmStdString, cmStdString> HeaderLocationCache;
+
+  cmStdString CacheFileName;
+
+  void WriteCacheFile() const;
+  void ReadCacheFile();
+private:
+  cmDependsC(cmDependsC const&); // Purposely not implemented.
+  void operator=(cmDependsC const&); // Purposely not implemented.
+};
+
+#endif
-- 
1.7.3.1.msysgit.0

commit ac1ac0fcf87dbff595400cef9e1f8ae213c33a8a
Author: Jérôme Gardou <jerome.gardou@laposte.net>
Date:   Tue Jun 28 19:02:12 2011 +0200

    Implements raw replacement for IMPLICIT_DEPENDS_INCLUDE_TRANSFORM target property

diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index a76b3af..881dc97 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -511,7 +511,7 @@ void cmDependsC::SetupTransforms()
       xform += tri->first;
       sep = "|";
       }
-    xform += ")[ \t]*\\(([^),]*)\\)";
+    xform += ")[ \t]*\\(?([^),]*)\\)?";
     this->IncludeRegexTransform.compile(xform.c_str());
 
     // Build a string that encodes all transformation rules and will
@@ -522,8 +522,8 @@ void cmDependsC::SetupTransforms()
       {
       this->IncludeRegexTransformString += " ";
       this->IncludeRegexTransformString += tri->first;
-      this->IncludeRegexTransformString += "(%)=";
-      this->IncludeRegexTransformString += tri->second;
+      this->IncludeRegexTransformString += tri->second.equals;
+      this->IncludeRegexTransformString += tri->second.value;
       }
     }
 }
@@ -534,13 +534,19 @@ void cmDependsC::ParseTransform(std::string const& xform)
   // A transform rule is of the form SOME_MACRO(%)=value-with-%
   // We can simply separate with "(%)=".
   std::string::size_type pos = xform.find("(%)=");
+  int substringPos = 4;
+  if(pos == xform.npos || pos == 0)
+    {
+    pos = xform.find("=");
+    substringPos = 1;
+    }
   if(pos == xform.npos || pos == 0)
     {
     return;
     }
   std::string name = xform.substr(0, pos);
-  std::string value = xform.substr(pos+4, xform.npos);
-  this->TransformRules[name] = value;
+  this->TransformRules[name].equals = xform.substr(pos, substringPos);
+  this->TransformRules[name].value = xform.substr(pos+substringPos, xform.npos);
 }
 
 //----------------------------------------------------------------------------
@@ -557,11 +563,16 @@ void cmDependsC::TransformLine(std::string& line)
     {
     return;
     }
+  if(tri->second.equals == "=")
+  {
+      line.replace(line.find(tri->first),tri->first.length(), tri->second.value);
+      return;
+  }
 
   // Construct the transformed line.
   std::string newline = this->IncludeRegexTransform.match(1);
   std::string arg = this->IncludeRegexTransform.match(4);
-  for(const char* c = tri->second.c_str(); *c; ++c)
+  for(const char* c = tri->second.value.c_str(); *c; ++c)
     {
     if(*c == '%')
       {
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index bd9a4b7..13b4ac3 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -58,7 +58,13 @@ protected:
   // Regex to transform #include lines.
   std::string IncludeRegexTransformString;
   cmsys::RegularExpression IncludeRegexTransform;
-  typedef std::map<cmStdString, cmStdString> TransformRulesType;
+  class TransformRule
+  {
+  public:
+      cmStdString equals;
+      cmStdString value;
+  };
+  typedef std::map<cmStdString, TransformRule> TransformRulesType;
   TransformRulesType TransformRules;
   void SetupTransforms();
   void ParseTransform(std::string const& xform);