diff options
author | Brad King <brad.king@kitware.com> | 2001-09-20 14:54:29 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2001-09-20 14:54:29 (GMT) |
commit | 65ef85320a900c620f235fddc17ae2a6068ec75d (patch) | |
tree | 8dc6841de28a34c7536bff6bdf8d217c9f92d8f2 /Source/cmFindProgramCommand.cxx | |
parent | ee86c59cba8884879e94361044dd8d4359abfd6e (diff) | |
download | CMake-65ef85320a900c620f235fddc17ae2a6068ec75d.zip CMake-65ef85320a900c620f235fddc17ae2a6068ec75d.tar.gz CMake-65ef85320a900c620f235fddc17ae2a6068ec75d.tar.bz2 |
ENH: Added cmSystemTools::GlobDirs function to allow wildcards in paths (like /foo/bar/*).
Diffstat (limited to 'Source/cmFindProgramCommand.cxx')
-rw-r--r-- | Source/cmFindProgramCommand.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index d40d7f9..1195ea8 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -91,7 +91,8 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string>& args) else { cmSystemTools::ExpandRegistryValues(args[j]); - path.push_back(args[j]); + // Glob the entry in case of wildcards. + cmSystemTools::GlobDirs(args[j].c_str(), path); } } } @@ -108,7 +109,9 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string>& args) std::string exp = args[j]; m_Makefile->ExpandVariablesInString(exp); cmSystemTools::ExpandRegistryValues(exp); - path.push_back(exp); + + // Glob the entry in case of wildcards. + cmSystemTools::GlobDirs(exp.c_str(), path); } } for(std::vector<std::string>::iterator i = names.begin(); |