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

ENH: Simplify framework -F flag generation 

This removes an unnecessary use of ConvertToOutputForExisting which is
needed only on Windows to consider short-pathing.
This commit is contained in:
Brad King 2008-10-09 15:07:35 -04:00
parent 7876a5098b
commit 8bffd5af36
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalGenerator.cxx
View File

@ -1155,9 +1155,11 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str()); frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second) if(emitted.insert(frameworkDir).second)
{ {
includeFlags includeFlags
<< "-F" << "-F" << this->Convert(frameworkDir.c_str(),
<< this->ConvertToOutputForExisting(frameworkDir.c_str()) << " "; cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL, true)
<< " ";
} }
continue; continue;
} }

4
Source/cmMakefileTargetGenerator.cxx
View File

@ -1452,7 +1452,9 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
if(emitted.insert(*i).second) if(emitted.insert(*i).second)
{ {
flags += "-F"; flags += "-F";
flags += this->LocalGenerator->ConvertToOutputForExisting(i->c_str()); flags += this->Convert(i->c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL, true);
flags += " "; flags += " ";
} }
} }