summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-10-09 19:07:35 (GMT)
committerBrad King <brad.king@kitware.com>2008-10-09 19:07:35 (GMT)
commit8bffd5af368ecbf8e49ee0b898dfa89635668859 (patch)
tree1feb9e512e63733e101c617ec0514921cdabc335 /Source/cmLocalGenerator.cxx
parent7876a5098be3b706a4a6033a1ded467a29a042cd (diff)
downloadCMake-8bffd5af368ecbf8e49ee0b898dfa89635668859.zip
CMake-8bffd5af368ecbf8e49ee0b898dfa89635668859.tar.gz
CMake-8bffd5af368ecbf8e49ee0b898dfa89635668859.tar.bz2
ENH: Simplify framework -F flag generation
This removes an unnecessary use of ConvertToOutputForExisting which is needed only on Windows to consider short-pathing.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c192263..f87924b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1155,9 +1155,11 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second)
{
- includeFlags
- << "-F"
- << this->ConvertToOutputForExisting(frameworkDir.c_str()) << " ";
+ includeFlags
+ << "-F" << this->Convert(frameworkDir.c_str(),
+ cmLocalGenerator::START_OUTPUT,
+ cmLocalGenerator::SHELL, true)
+ << " ";
}
continue;
}