From 8bffd5af368ecbf8e49ee0b898dfa89635668859 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 9 Oct 2008 15:07:35 -0400 Subject: [PATCH] ENH: Simplify framework -F flag generation This removes an unnecessary use of ConvertToOutputForExisting which is needed only on Windows to consider short-pathing. --- Source/cmLocalGenerator.cxx | 8 +++++--- Source/cmMakefileTargetGenerator.cxx | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c1922631b..f87924b6d 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; } diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 962cdfabb..f50bd31fd 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1452,7 +1452,9 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags() if(emitted.insert(*i).second) { flags += "-F"; - flags += this->LocalGenerator->ConvertToOutputForExisting(i->c_str()); + flags += this->Convert(i->c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL, true); flags += " "; } }