ENH: Improved support for user-configured search paths. Paths given in the CMAKE_LIBRARY_PATH cmake variable are searched first, then those in the CMAKE_LIBRARY_PATH environment variable, then those listed in the call to the FIND_LIBRARY command and finally those listed in the PATH environment variable. The support is similar for finding include files with FIND_PATH, but the variable is CMAKE_INCLUDE_PATH.

1 files changed, 8 insertions, 6 deletions

diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx
index 35e6d0c..83d5faa 100644
--- a/Source/cmFindPathCommand.cxx
+++ b/Source/cmFindPathCommand.cxx
@@ -64,20 +64,22 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
       helpString = hs?hs:"(none)";
       }
     }
+
+  // Construct a search path.
   std::vector<std::string> path;
-  // add any user specified paths
+  std::vector<std::string> callPaths;
   for (unsigned int j = 2; j < args.size(); j++)
     {
     // expand variables
     std::string exp = args[j];
-    cmSystemTools::ExpandRegistryValues(exp);      
+    cmSystemTools::ExpandRegistryValues(exp);
 
     // Glob the entry in case of wildcards.
-    cmSystemTools::GlobDirs(exp.c_str(), path);
+    cmSystemTools::GlobDirs(exp.c_str(), callPaths);
     }
-  cmSystemTools::GetPath(path, "CMAKE_INCLUDE_PATH");
-  // add the standard path
-  cmSystemTools::GetPath(path);
+  m_Makefile->GetIncludeSearchPath(callPaths, path);
+
+  // Use the search path to find the file.
   unsigned int k;
   for(k=0; k < path.size(); k++)
     {