diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2002-05-12 15:32:29 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2002-05-12 15:32:29 (GMT) |
| commit | ebebe660dfb8751e801168e5a2e8efb2acf7854d (patch) | |
| tree | 524dbfe77add679e5665603da96c1195121234f5 /Source | |
| parent | 1ad05f9e6d423187b4426be6117820cb791e86ba (diff) | |
| download | CMake-ebebe660dfb8751e801168e5a2e8efb2acf7854d.zip CMake-ebebe660dfb8751e801168e5a2e8efb2acf7854d.tar.gz CMake-ebebe660dfb8751e801168e5a2e8efb2acf7854d.tar.bz2 | |
ENH: add no_system_path option to FindProgram so that the PATH is ignored
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 8 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 43924b6..0eaaed5 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1428,7 +1428,8 @@ std::string cmSystemTools::FindFile(const char* name, * found. Otherwise, the empty string is returned. */ 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. if(cmSystemTools::FileExists(name) && @@ -1446,7 +1447,10 @@ std::string cmSystemTools::FindProgram(const char* name, // Add the system search path to our path. 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(); p != path.end(); ++p) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 62d5568..df12513 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -220,7 +220,8 @@ public: ///! Find an executable in the system PATH, with optional extra paths. 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. static std::string FindLibrary(const char* name, |