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

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Dec 19 11:06:49 EST 2007


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

Modified Files:
	cmFindBase.cxx 
Log Message:
ENH: Renamed CMAKE_FIND_PREFIX_PATH to CMAKE_PREFIX_PATH for brevity and consistency with other find path variable names.


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmFindBase.cxx	19 Dec 2007 15:34:43 -0000	1.27
+++ cmFindBase.cxx	19 Dec 2007 16:06:47 -0000	1.28
@@ -83,7 +83,7 @@
     "1. Search cmake specific environment variables.  This "
     "can be skipped if NO_CMAKE_ENVIRONMENT_PATH is passed.\n"
     ""
-    "   <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_FIND_PREFIX_PATH\n"
+    "   <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_PREFIX_PATH\n"
     "   CMAKE_FRAMEWORK_PATH\n"
     "   CMAKE_APPBUNDLE_PATH\n"
     "   CMAKE_XXX_PATH\n"
@@ -93,7 +93,7 @@
     "-DVAR=value.  This can be skipped if NO_CMAKE_PATH "
     "is passed.\n"
     ""
-    "   <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_FIND_PREFIX_PATH\n"
+    "   <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_PREFIX_PATH\n"
     "   CMAKE_FRAMEWORK_PATH\n"
     "   CMAKE_APPBUNDLE_PATH\n"
     "   CMAKE_XXX_PATH\n"
@@ -553,7 +553,7 @@
   std::vector<std::string> paths;
 
   std::vector<std::string> prefixPaths;
-  cmSystemTools::GetPath(prefixPaths, "CMAKE_FIND_PREFIX_PATH");
+  cmSystemTools::GetPath(prefixPaths, "CMAKE_PREFIX_PATH");
   this->AddFindPrefix(paths, prefixPaths);
 
   std::string var = "CMAKE_";
@@ -690,7 +690,7 @@
   std::vector<std::string> paths;
 
   if(const char* prefixPath = 
-      this->Makefile->GetDefinition("CMAKE_FIND_PREFIX_PATH"))
+      this->Makefile->GetDefinition("CMAKE_PREFIX_PATH"))
     {
     std::vector<std::string> prefixPaths;
     cmSystemTools::ExpandListArgument(prefixPath, prefixPaths);



More information about the Cmake-commits mailing list