Commit 42b76aea authored by Bill Hoffman's avatar Bill Hoffman
Browse files

BUG: remove part of patch from bug 1965 that set executable paths

parent 3d5a724d
...@@ -724,10 +724,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, ...@@ -724,10 +724,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
this->OutputLibraries(fout, configName, libName, target); this->OutputLibraries(fout, configName, libName, target);
fout << "\"\n"; fout << "\"\n";
temp = m_ExecutableOutputPath; temp = m_ExecutableOutputPath;
temp += configName;
if (!m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH_OVERRIDE"))
temp += configName;
temp += "/"; temp += "/";
// do we have a different executable name? // do we have a different executable name?
...@@ -740,8 +737,6 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, ...@@ -740,8 +737,6 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
temp += libName; temp += libName;
} }
temp += debugPostfix;
temp += ".exe"; temp += ".exe";
fout << "\t\t\t\tOutputFile=\"" << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n"; fout << "\t\t\t\tOutputFile=\"" << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
for(std::map<cmStdString, cmStdString>::iterator i = flagMap.begin(); for(std::map<cmStdString, cmStdString>::iterator i = flagMap.begin();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment