ENH: Split CMAKE_STANDARD_LIBRARIES into per-language variables CMAKE_<lang>_STANDARD_LIBRARIES. This is needed to get programmable language support working with Visual Studio generators. It makes sense anyway.

1 files changed, 31 insertions, 10 deletions

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b6fd4f8..6fa2a9a 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1059,17 +1059,38 @@ void cmLocalVisualStudio6Generator
     libMultiLineOptionsForDebug +=  extraLinkOptions;
     libMultiLineOptionsForDebug += " \n";
     }
-  if(const char* stdLibs =  this->Makefile->GetDefinition("CMAKE_STANDARD_LIBRARIES"))
+  if(target.GetType() >= cmTarget::EXECUTABLE && 
+     target.GetType() <= cmTarget::MODULE_LIBRARY)
     {
-    libOptions += " ";
-    libOptions += stdLibs;
-    libOptions += " ";
-    libMultiLineOptions += "# ADD LINK32 ";
-    libMultiLineOptions +=  stdLibs;
-    libMultiLineOptions += " \n";
-    libMultiLineOptionsForDebug += "# ADD LINK32 ";
-    libMultiLineOptionsForDebug +=  stdLibs;
-    libMultiLineOptionsForDebug += " \n";
+    // Get the language to use for linking.
+    const char* linkLanguage = target.GetLinkerLanguage(this->GetGlobalGenerator());
+    if(!linkLanguage)
+      {
+      cmSystemTools::Error("CMake can not determine linker language for target:",
+                           target.GetName());
+      return;
+      }
+
+    // Compute the variable name to lookup standard libraries for this
+    // language.
+    std::string standardLibsVar = "CMAKE_";
+    standardLibsVar += linkLanguage;
+    standardLibsVar += "_STANDARD_LIBRARIES";
+
+    // Add standard libraries.
+    if(const char* stdLibs =
+       this->Makefile->GetDefinition(standardLibsVar.c_str()))
+      {
+      libOptions += " ";
+      libOptions += stdLibs;
+      libOptions += " ";
+      libMultiLineOptions += "# ADD LINK32 ";
+      libMultiLineOptions +=  stdLibs;
+      libMultiLineOptions += " \n";
+      libMultiLineOptionsForDebug += "# ADD LINK32 ";
+      libMultiLineOptionsForDebug +=  stdLibs;
+      libMultiLineOptionsForDebug += " \n";
+      }
     }
   if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
     {