ENH: add first cut at support for exe with same name as lib

1 files changed, 15 insertions, 4 deletions

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f463717..dfb1ca5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -739,9 +739,11 @@ inline std::string removeQuotes(const std::string& s)
 }
 
   
-void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const char *libName,
-                                   const cmTarget &target, 
-                                 std::vector<cmSourceGroup> &)
+void cmLocalVisualStudio6Generator
+::WriteDSPHeader(std::ostream& fout, 
+                 const char *libName,
+                 const cmTarget &target, 
+                 std::vector<cmSourceGroup> &)
 {
   std::set<std::string> pathEmitted;
   
@@ -948,7 +950,16 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
   std::string extraLinkOptions;
   if(target.GetType() == cmTarget::EXECUTABLE)
     {
-    extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
+    extraLinkOptions = 
+      m_Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
+
+    // if the executable has an output name then add the appropriate flag
+    if (target.GetProperty("OUTPUT_NAME"))
+      {
+      libMultiLineOptions += "# ADD LINK32 /out:";
+      libMultiLineOptions += target.GetProperty("OUTPUT_NAME");
+      libMultiLineOptions += " \n";
+      }
     }
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
     {