From 19ae75a934ffeaad82b24b189691b5f2f2befe9d Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 13 Jul 2005 16:20:25 -0400 Subject: BUG: try to fix failed test --- Source/cmLocalVisualStudio6Generator.cxx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index c08cd66..ea13277 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -982,23 +982,27 @@ void cmLocalVisualStudio6Generator } else { - libMultiLineOptions += "# ADD LINK32 /out:\""; if(exePath != "") + { libMultiLineOptions += exePath + "/" + libName + ".exe"; + } else + { libMultiLineOptions += std::string(libName) + ".exe"; - + } libMultiLineOptions += "\"\n"; - - libMultiLineOptionsForDebug += "# ADD LINK32 /out:\""; - if(exePath != "") - libMultiLineOptionsForDebug += exePath + "/" + libName + "D.exe"; + { + libMultiLineOptionsForDebug += exePath + "$(INTDIR)/" + libName + "D.exe"; + } else - libMultiLineOptionsForDebug += std::string(libName) + "D.exe"; + { + libMultiLineOptionsForDebug += std::string("$(INTDIR)/") + + std::string(libName) + "D.exe"; + } libMultiLineOptionsForDebug += "\"\n"; } -- cgit v0.12