summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx15
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 961de37..fe481fa 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1196,7 +1196,7 @@ cmLocalGenerator::ConvertToIncludeReference(std::string const& path)
}
//----------------------------------------------------------------------------
-const char* cmLocalGenerator::GetIncludeFlags(
+std::string cmLocalGenerator::GetIncludeFlags(
const std::vector<std::string> &includes,
const char* lang, bool forResponseFile)
{
@@ -1204,12 +1204,6 @@ const char* cmLocalGenerator::GetIncludeFlags(
{
return "";
}
- std::string key = lang;
- key += forResponseFile? "@" : "";
- if(this->LanguageToIncludeFlags.count(key))
- {
- return this->LanguageToIncludeFlags[key].c_str();
- }
cmOStringStream includeFlags;
@@ -1314,12 +1308,7 @@ const char* cmLocalGenerator::GetIncludeFlags(
{
flags[flags.size()-1] = ' ';
}
- this->LanguageToIncludeFlags[key] = flags;
-
- // Use this temorary variable for the return value to work-around a
- // bogus GCC 2.95 warning.
- const char* ret = this->LanguageToIncludeFlags[key].c_str();
- return ret;
+ return flags;
}
//----------------------------------------------------------------------------