diff options
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2633746..2fb81b7 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2149,12 +2149,12 @@ std::string cmMakefile::FindLibrary(const char* name, { return cmSystemTools::CollapseFullPath(name); } - // Add the system search path to our path. - std::vector<std::string> path = userPaths; + std::vector<std::string> path; cmSystemTools::GetPath(path, "CMAKE_LIBRARY_PATH"); cmSystemTools::GetPath(path); - + // now add the path + path.insert(path.end(), userPaths.begin(), userPaths.end()); // Add some lib directories specific to compilers, depending on the // current generator, so that library that might have been stored here // can be found too. diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index d0601ff..c13ffc2 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -1096,7 +1096,8 @@ kwsys_stl::string SystemTools::FindFile(const char* name, const kwsys_stl::vector<kwsys_stl::string>& userPaths) { // Add the system search path to our path first - kwsys_stl::vector<kwsys_stl::string> path; + kwsys_stl::vector<kwsys_stl::string> path; + SystemTools::GetPath(path, "CMAKE_FILE_PATH"); SystemTools::GetPath(path); // now add the additional paths path.insert(path.end(), userPaths.begin(), userPaths.end()); @@ -1145,13 +1146,14 @@ kwsys_stl::string SystemTools::FindProgram( { return SystemTools::CollapseFullPath(tryPath.c_str()); } - - // Add the system search path to our path. kwsys_stl::vector<kwsys_stl::string> path; + SystemTools::GetPath(path, "CMAKE_PROGRAM_PATH"); + // Add the system search path to our path. if (!no_system_path) { SystemTools::GetPath(path); } + // now add the additional paths path.insert(path.end(), userPaths.begin(), userPaths.end()); |