kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmLocalGenerator: Simplify GetIncludeFlags output formatting 

Use the output format argument to ConvertToIncludeReference.
This commit is contained in:
Brad King 2014-03-04 13:12:54 -05:00
parent 971653b767
commit b9aa504198
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmLocalGenerator.cxx
View File

@ -1295,6 +1295,7 @@ std::string cmLocalGenerator::GetIncludeFlags(
return ""; return "";
} }
OutputFormat shellFormat = forResponseFile? RESPONSE : SHELL;
cmOStringStream includeFlags; cmOStringStream includeFlags;
std::string flagVar = "CMAKE_INCLUDE_FLAG_"; std::string flagVar = "CMAKE_INCLUDE_FLAG_";
@ -1354,10 +1355,9 @@ std::string cmLocalGenerator::GetIncludeFlags(
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str()); frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second) if(emitted.insert(frameworkDir).second)
{ {
OutputFormat format = forResponseFile? RESPONSE : SHELL;
includeFlags includeFlags
<< fwSearchFlag << this->Convert(frameworkDir.c_str(), << fwSearchFlag << this->Convert(frameworkDir.c_str(),
START_OUTPUT, format, true) START_OUTPUT, shellFormat, true)
<< " "; << " ";
} }
continue; continue;
@ -1376,16 +1376,8 @@ std::string cmLocalGenerator::GetIncludeFlags(
} }
flagUsed = true; flagUsed = true;
} }
std::string includePath; std::string includePath =
if(forResponseFile) this->ConvertToIncludeReference(*i, shellFormat);
{
includePath = this->Convert(i->c_str(), START_OUTPUT,
RESPONSE, true);
}
else
{
includePath = this->ConvertToIncludeReference(*i);
}
if(quotePaths && includePath.size() && includePath[0] != '\"') if(quotePaths && includePath.size() && includePath[0] != '\"')
{ {
includeFlags << "\""; includeFlags << "\"";