diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-17 17:49:09 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-17 17:49:09 (GMT) |
| commit | c59937a4a84cfd9da7fdfe410e928eab9afe1998 (patch) | |
| tree | 7eaf8a612e8e7a867e4ddbd360f299d66a560692 /Source/cmMakefile.cxx | |
| parent | a5b8b06031d1a8989801e90884fe377384a2d5eb (diff) | |
| download | CMake-c59937a4a84cfd9da7fdfe410e928eab9afe1998.zip CMake-c59937a4a84cfd9da7fdfe410e928eab9afe1998.tar.gz CMake-c59937a4a84cfd9da7fdfe410e928eab9afe1998.tar.bz2 | |
ENH: put the system path ahead of the command path
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2fb9349..85c6620 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2382,12 +2382,12 @@ cmMakefile::GetIncludeSearchPath(const std::vector<std::string>& callerPaths, // Add paths in the user's environment. cmSystemTools::GetPath(path, "CMAKE_INCLUDE_PATH"); cmSystemTools::GetPath(path, "INCLUDE"); + // Add standard system paths. + cmSystemTools::GetPath(path); // Add paths given by the caller. path.insert(path.end(), callerPaths.begin(), callerPaths.end()); - // Add standard system paths. - cmSystemTools::GetPath(path); } //---------------------------------------------------------------------------- @@ -2404,12 +2404,11 @@ cmMakefile::GetLibrarySearchPath(const std::vector<std::string>& callerPaths, // Add paths in the user's environment. cmSystemTools::GetPath(path, "CMAKE_LIBRARY_PATH"); cmSystemTools::GetPath(path, "LIB"); + // Add standard system paths. + cmSystemTools::GetPath(path); // Add paths given by the caller. path.insert(path.end(), callerPaths.begin(), callerPaths.end()); - - // Add standard system paths. - cmSystemTools::GetPath(path); } std::string cmMakefile::GetModulesFile(const char* filename) |