[cmake-commits] king committed cmLocalGenerator.cxx 1.219 1.220

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
ENH: Use CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES from platform files to block link directories.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- cmLocalGenerator.cxx	18 May 2007 14:32:22 -0000	1.219
+++ cmLocalGenerator.cxx	18 May 2007 15:36:23 -0000	1.220
@@ -1512,9 +1512,17 @@
 
   // Some search paths should never be emitted
   emitted.insert("");
-  emitted.insert("/usr/lib");
-  emitted.insert("/usr/lib32");
-  emitted.insert("/usr/lib64");
+  if(const char* implicitLinks =
+     (this->Makefile->GetDefinition
+      ("CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES")))
+    {
+    std::vector<std::string> implicitLinkVec;
+    cmSystemTools::ExpandListArgument(implicitLinks, implicitLinkVec);
+    for(unsigned int k = 0; k < implicitLinkVec.size(); ++k)
+      {
+      emitted.insert(implicitLinkVec[k]);
+      }
+    }
   std::string libPathFlag = 
     this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
   std::string libLinkFlag =