summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2011-09-07 01:41:41 (GMT)
committerPeter Collingbourne <peter@pcc.me.uk>2011-10-02 17:30:43 (GMT)
commit5b114c9bee735eebf3e6b4d6ef18e4c732ac55f0 (patch)
tree7725a59aaf9a3d263a94f4c86f38250111f8a41f /Source
parent903d914b28655f0643409c4c165654b1daf2e0fd (diff)
downloadCMake-5b114c9bee735eebf3e6b4d6ef18e4c732ac55f0.zip
CMake-5b114c9bee735eebf3e6b4d6ef18e4c732ac55f0.tar.gz
CMake-5b114c9bee735eebf3e6b4d6ef18e4c732ac55f0.tar.bz2
Introduce a cmLocalGenerator::ConvertToIncludeReference function
This provides a mechanism for the local generator to override how header search paths are generated.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalGenerator.cxx9
-rw-r--r--Source/cmLocalGenerator.h4
2 files changed, 11 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6af7fd5..aeda164 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1185,6 +1185,13 @@ cmLocalGenerator::ConvertToOutputForExisting(RelativeRoot remote,
}
//----------------------------------------------------------------------------
+std::string
+cmLocalGenerator::ConvertToIncludeReference(std::string const& path)
+{
+ return this->ConvertToOutputForExisting(path.c_str());
+}
+
+//----------------------------------------------------------------------------
const char* cmLocalGenerator::GetIncludeFlags(const char* lang,
bool forResponseFile)
{
@@ -1285,7 +1292,7 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang,
}
else
{
- includePath = this->ConvertToOutputForExisting(i->c_str());
+ includePath = this->ConvertToIncludeReference(*i);
}
if(quotePaths && includePath.size() && includePath[0] != '\"')
{
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 69e452b..c0fe886 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -179,7 +179,9 @@ public:
path and short path if spaces. */
std::string ConvertToOutputForExisting(RelativeRoot remote,
const char* local = 0);
-
+
+ virtual std::string ConvertToIncludeReference(std::string const& path);
+
/** Called from command-line hook to clear dependencies. */
virtual void ClearDependencies(cmMakefile* /* mf */,
bool /* verbose */) {}