Ver Fonte

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

Bill Hoffman há 20 anos atrás
pai
commit
42b76aea32
1 ficheiros alterados com 1 adições e 6 exclusões
  1. 1 6
      Source/cmLocalVisualStudio7Generator.cxx

+ 1 - 6
Source/cmLocalVisualStudio7Generator.cxx

@@ -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;
-          
-    if (!m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH_OVERRIDE"))
-      temp += configName;
-
+    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,
       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();