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

ENH: add no_system_path option to FindProgram so that the PATH is ignored

This commit is contained in:
Sebastien Barre 2002-05-12 11:32:29 -04:00
parent 1ad05f9e6d
commit ebebe660df
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmSystemTools.cxx
View File

@ -1428,7 +1428,8 @@ std::string cmSystemTools::FindFile(const char* name,
* found. Otherwise, the empty string is returned. * found. Otherwise, the empty string is returned.
*/ */
std::string cmSystemTools::FindProgram(const char* name, std::string cmSystemTools::FindProgram(const char* name,
const std::vector<std::string>& userPaths) const std::vector<std::string>& userPaths,
bool no_system_path)
{ {
// See if the executable exists as written. // See if the executable exists as written.
if(cmSystemTools::FileExists(name) && if(cmSystemTools::FileExists(name) &&
@ -1446,7 +1447,10 @@ std::string cmSystemTools::FindProgram(const char* name,
// Add the system search path to our path. // Add the system search path to our path.
std::vector<std::string> path = userPaths; std::vector<std::string> path = userPaths;
cmSystemTools::GetPath(path); if (!no_system_path)
{
cmSystemTools::GetPath(path);
}
for(std::vector<std::string>::const_iterator p = path.begin(); for(std::vector<std::string>::const_iterator p = path.begin();
p != path.end(); ++p) p != path.end(); ++p)

3
Source/cmSystemTools.h
View File

@ -220,7 +220,8 @@ public:
///! Find an executable in the system PATH, with optional extra paths. ///! Find an executable in the system PATH, with optional extra paths.
static std::string FindProgram(const char* name, static std::string FindProgram(const char* name,
const std::vector<std::string>& path= std::vector<std::string>()); const std::vector<std::string>& path = std::vector<std::string>(),
bool no_system_path = false);
///! Find a library in the system PATH, with optional extra paths. ///! Find a library in the system PATH, with optional extra paths.
static std::string FindLibrary(const char* name, static std::string FindLibrary(const char* name,