ENH: Simplify framework -F flag generation

This removes an unnecessary use of ConvertToOutputForExisting which is
needed only on Windows to consider short-pathing.

2 files changed, 8 insertions, 4 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;
       }
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 962cdfa..f50bd31 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 += " ";
       }
     }