diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-13 20:20:25 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-13 20:20:25 (GMT) |
| commit | 19ae75a934ffeaad82b24b189691b5f2f2befe9d (patch) | |
| tree | 9eb83f2a7a2a0d15183df5dc5039d40df9b3a228 | |
| parent | 041d4688ec7db86168a5e6de497e1354698083aa (diff) | |
| download | CMake-19ae75a934ffeaad82b24b189691b5f2f2befe9d.zip CMake-19ae75a934ffeaad82b24b189691b5f2f2befe9d.tar.gz CMake-19ae75a934ffeaad82b24b189691b5f2f2befe9d.tar.bz2 | |
BUG: try to fix failed test
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 18 |
1 files 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"; } |