[cmake-commits] king committed cmLocalGenerator.cxx 1.146 1.147

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv14618

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Do not look for linker language unless it is needed.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- cmLocalGenerator.cxx	15 Sep 2006 18:09:09 -0000	1.146
+++ cmLocalGenerator.cxx	16 Sep 2006 15:52:00 -0000	1.147
@@ -1639,17 +1639,6 @@
   const std::vector<std::string>&
     linkDirectories = target.GetLinkDirectories();
 
-  // Get the language used for linking.
-  const char* linkLanguage =
-    target.GetLinkerLanguage(this->GetGlobalGenerator());
-  if(!linkLanguage)
-    {
-    cmSystemTools::
-      Error("CMake can not determine linker language for target:",
-            target.GetName());
-    return;
-    }
-
   // Lookup link type selection flags.
   const char* static_link_type_flag = 0;
   const char* shared_link_type_flag = 0;
@@ -1663,6 +1652,17 @@
     }
   if(target_type_str)
     {
+    // Get the language used for linking.
+    const char* linkLanguage =
+      target.GetLinkerLanguage(this->GetGlobalGenerator());
+
+    if(!linkLanguage)
+      {
+      cmSystemTools::
+        Error("CMake can not determine linker language for target:",
+              target.GetName());
+      return;
+      }
     std::string static_link_type_flag_var = "CMAKE_";
     static_link_type_flag_var += target_type_str;
     static_link_type_flag_var += "_LINK_STATIC_";