[cmake-commits] king committed cmFindBase.cxx 1.26 1.27

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindBase.cxx 
Log Message:
ENH: Added CMAKE_SYSTEM_PREFIX_PATH variable.


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cmFindBase.cxx	15 Dec 2007 19:14:05 -0000	1.26
+++ cmFindBase.cxx	19 Dec 2007 15:34:43 -0000	1.27
@@ -104,6 +104,7 @@
     "4. Search cmake variables defined in the Platform files "
     "for the current system.  This can be skipped if NO_CMAKE_SYSTEM_PATH "
     "is passed.\n"
+    "   <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_SYSTEM_PREFIX_PATH\n"
     "   CMAKE_SYSTEM_FRAMEWORK_PATH\n"
     "   CMAKE_SYSTEM_APPBUNDLE_PATH\n"
     "   CMAKE_SYSTEM_XXX_PATH\n"
@@ -738,6 +739,13 @@
   var += this->CMakePathName;
   var += "_PATH";
   std::vector<std::string> paths;
+  if(const char* prefixPath =
+      this->Makefile->GetDefinition("CMAKE_SYSTEM_PREFIX_PATH"))
+    {
+    std::vector<std::string> prefixPaths;
+    cmSystemTools::ExpandListArgument(prefixPath, prefixPaths);
+    this->AddFindPrefix(paths, prefixPaths);
+    }
   if(const char* path = this->Makefile->GetDefinition(var.c_str()))
     {
     cmSystemTools::ExpandListArgument(path, paths);