diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-06-30 15:31:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-06-30 15:31:41 (GMT) |
| commit | 40fbba22a48271d6ee358f766ba680729e56b253 (patch) | |
| tree | a5154b69285493c868c4af4ef2724eabbf6408af /Source/cmMakefile.cxx | |
| parent | 35033f248d58e27ff453d6729187f51ba4a36ab0 (diff) | |
| download | CMake-40fbba22a48271d6ee358f766ba680729e56b253.zip CMake-40fbba22a48271d6ee358f766ba680729e56b253.tar.gz CMake-40fbba22a48271d6ee358f766ba680729e56b253.tar.bz2 | |
ENH: add CMAKE_FILE_PATH, CMAKE_PROGRAM_PATH, CMAKE_LIBRARY_PATH, and search them first, PATH second, and last the paths listed in the FIND call
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 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. |