mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Optionally pass include directories with response files

Browse Source 
Create platform option CMAKE_<lang>_USE_RESPONSE_FILE_FOR_INCLUDES to
enable use of response files for passing the list of include directories
to compiler command lines.
This commit is contained in:
Brad King
2011-03-15 14:07:36 -04:00
parent 6e8a67f99a
commit 9a0b9bc8b7
7 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
+20 -8
View File
@@ -1185,15 +1185,18 @@ cmLocalGenerator::ConvertToOutputForExisting(RelativeRoot remote,
}
//----------------------------------------------------------------------------
const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
const char* cmLocalGenerator::GetIncludeFlags(const char* lang,
bool forResponseFile)
{
if(!lang)
{
return "";
}
if(this->LanguageToIncludeFlags.count(lang))
std::string key = lang;
key += forResponseFile? "@" : "";
if(this->LanguageToIncludeFlags.count(key))
{
return this->LanguageToIncludeFlags[lang].c_str();
return this->LanguageToIncludeFlags[key].c_str();
}
cmOStringStream includeFlags;
@@ -1251,10 +1254,10 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second)
{
OutputFormat format = forResponseFile? RESPONSE : SHELL;
includeFlags
<< "-F" << this->Convert(frameworkDir.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL, true)
START_OUTPUT, format, true)
<< " ";
}
continue;
@@ -1274,7 +1277,16 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
}
flagUsed = true;
}
std::string includePath = this->ConvertToOutputForExisting(i->c_str());
std::string includePath;
if(forResponseFile)
{
includePath = this->Convert(i->c_str(), START_OUTPUT,
RESPONSE, true);
}
else
{
includePath = this->ConvertToOutputForExisting(i->c_str());
}
if(quotePaths && includePath.size() && includePath[0] != '\"')
{
includeFlags << "\"";
@@ -1292,11 +1304,11 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
{
flags[flags.size()-1] = ' ';
}
this->LanguageToIncludeFlags[lang] = flags;
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[lang].c_str();
const char* ret = this->LanguageToIncludeFlags[key].c_str();
return ret;
}