summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-07-13 20:57:29 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-07-13 20:57:29 (GMT)
commit42b76aea321c05f469ae4d1d1ca6c395188a8c17 (patch)
treef90378fcf2dad567094b528e11b53e0e84483ce9
parent3d5a724deb18d0c54ef0037c54f64f8f9f99d63d (diff)
downloadCMake-42b76aea321c05f469ae4d1d1ca6c395188a8c17.zip
CMake-42b76aea321c05f469ae4d1d1ca6c395188a8c17.tar.gz
CMake-42b76aea321c05f469ae4d1d1ca6c395188a8c17.tar.bz2
BUG: remove part of patch from bug 1965 that set executable paths
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 04a36f1..52cccfd 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -724,10 +724,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
this->OutputLibraries(fout, configName, libName, target);
fout << "\"\n";
temp = m_ExecutableOutputPath;
-
- if (!m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH_OVERRIDE"))
- temp += configName;
-
+ temp += configName;
temp += "/";
// do we have a different executable name?
@@ -740,8 +737,6 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
temp += libName;
}
- temp += debugPostfix;
-
temp += ".exe";
fout << "\t\t\t\tOutputFile=\"" << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
for(std::map<cmStdString, cmStdString>::iterator i = flagMap.begin();