kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: put the system path ahead of the command path

This commit is contained in:
Bill Hoffman 2006-02-17 12:49:09 -05:00
parent a5b8b06031
commit c59937a4a8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -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)