Pārlūkot izejas kodu

Undo fix as it broke the dashboard

Bill Hoffman 20 gadi atpakaļ
vecāks
revīzija
bbdfcc581a
1 mainītis faili ar 6 papildinājumiem un 16 dzēšanām
  1. 6 16
      Source/cmLocalVisualStudio7Generator.cxx

+ 6 - 16
Source/cmLocalVisualStudio7Generator.cxx

@@ -573,9 +573,9 @@ void cmLocalVisualStudio7Generator::FillFlagMapFromCommandFlags(
 
 
 
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-                                                    const char* configName,
-                                                    const char *libName,
-                                                    const cmTarget &target)
+                                          const char* configName,
+                                          const char *libName,
+                                          const cmTarget &target)
 { 
 { 
   std::string temp;
   std::string temp;
   std::string debugPostfix = "";
   std::string debugPostfix = "";
@@ -586,27 +586,17 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     }  
     }  
   
   
   std::string extraLinkOptions;
   std::string extraLinkOptions;
-  std::string flagVar;
   if(target.GetType() == cmTarget::EXECUTABLE)
   if(target.GetType() == cmTarget::EXECUTABLE)
     {
     {
-    flagVar = "CMAKE_EXE_LINKER_FLAGS";
+    extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
     }
     }
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
     {
     {
-    flagVar = "CMAKE_SHARED_LINKER_FLAGS";
+    extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
     }
     }
   if(target.GetType() == cmTarget::MODULE_LIBRARY)
   if(target.GetType() == cmTarget::MODULE_LIBRARY)
     {
     {
-    flagVar  = "CMAKE_MODULE_LINKER_FLAGS";
-    }
-  extraLinkOptions = m_Makefile->GetRequiredDefinition(flagVar.c_str());
-  // Now add _DEBUG, _RELEASE, etc version of flagVar
-  if(configName)
-    {
-    flagVar += "_";
-    flagVar += cmSystemTools::UpperCase(std::string(configName));
-    extraLinkOptions += " ";
-    extraLinkOptions += m_Makefile->GetRequiredDefinition(flagVar.c_str());
+    extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
     }
     }
   
   
   const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
   const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");