Commit 0c0ef9e7 authored by Brad King's avatar Brad King
Browse files

cmLocalGenerator: Add format option to ConvertToIncludeReference

Replace the hard-coded SHELL output format with an optional argument.
parent 02bebd60
......@@ -1277,9 +1277,10 @@ cmLocalGenerator::ConvertToOutputForExisting(RelativeRoot remote,
//----------------------------------------------------------------------------
std::string
cmLocalGenerator::ConvertToIncludeReference(std::string const& path)
cmLocalGenerator::ConvertToIncludeReference(std::string const& path,
OutputFormat format)
{
return this->ConvertToOutputForExisting(path.c_str());
return this->ConvertToOutputForExisting(path.c_str(), START_OUTPUT, format);
}
//----------------------------------------------------------------------------
......
......@@ -207,7 +207,8 @@ public:
const char* local = 0,
OutputFormat format = SHELL);
virtual std::string ConvertToIncludeReference(std::string const& path);
virtual std::string ConvertToIncludeReference(std::string const& path,
OutputFormat format = SHELL);
/** Called from command-line hook to clear dependencies. */
virtual void ClearDependencies(cmMakefile* /* mf */,
......
......@@ -149,9 +149,10 @@ cmLocalNinjaGenerator::ConvertToLinkReference(std::string const& lib)
}
std::string
cmLocalNinjaGenerator::ConvertToIncludeReference(std::string const& path)
cmLocalNinjaGenerator::ConvertToIncludeReference(std::string const& path,
OutputFormat format)
{
return this->Convert(path.c_str(), HOME_OUTPUT, SHELL);
return this->Convert(path.c_str(), HOME_OUTPUT, format);
}
//----------------------------------------------------------------------------
......
......@@ -101,7 +101,8 @@ public:
protected:
virtual std::string ConvertToIncludeReference(std::string const& path);
virtual std::string ConvertToIncludeReference(std::string const& path,
OutputFormat format = SHELL);
private:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment