Browse Source

BUG: try to fix failed test

Bill Hoffman 20 years ago
parent
commit
19ae75a934
1 changed files with 11 additions and 7 deletions
  1. 11 7
      Source/cmLocalVisualStudio6Generator.cxx

+ 11 - 7
Source/cmLocalVisualStudio6Generator.cxx

@@ -982,23 +982,27 @@ void cmLocalVisualStudio6Generator
       }
       }
     else
     else
       {
       {
-
       libMultiLineOptions += "# ADD LINK32 /out:\"";
       libMultiLineOptions += "# ADD LINK32 /out:\"";
 
 
       if(exePath != "")
       if(exePath != "")
+        {
         libMultiLineOptions += exePath + "/" + libName + ".exe";
         libMultiLineOptions += exePath + "/" + libName + ".exe";
+        }
       else
       else
+        {
         libMultiLineOptions += std::string(libName) + ".exe";
         libMultiLineOptions += std::string(libName) + ".exe";
-                  
+        }
       libMultiLineOptions += "\"\n";
       libMultiLineOptions += "\"\n";
-        
-        
       libMultiLineOptionsForDebug += "# ADD LINK32 /out:\"";
       libMultiLineOptionsForDebug += "# ADD LINK32 /out:\"";
-
       if(exePath != "")
       if(exePath != "")
-        libMultiLineOptionsForDebug += exePath + "/" + libName + "D.exe";
+        {
+        libMultiLineOptionsForDebug += exePath + "$(INTDIR)/" + libName + "D.exe";
+        }
       else
       else
-        libMultiLineOptionsForDebug += std::string(libName) + "D.exe";
+        {
+        libMultiLineOptionsForDebug += std::string("$(INTDIR)/")
+          + std::string(libName) + "D.exe";
+        }
         
         
       libMultiLineOptionsForDebug += "\"\n";
       libMultiLineOptionsForDebug += "\"\n";
       }
       }