|
@@ -91,7 +91,8 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string>& args)
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
cmSystemTools::ExpandRegistryValues(args[j]);
|
|
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];
|
|
std::string exp = args[j];
|
|
|
m_Makefile->ExpandVariablesInString(exp);
|
|
m_Makefile->ExpandVariablesInString(exp);
|
|
|
cmSystemTools::ExpandRegistryValues(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();
|
|
for(std::vector<std::string>::iterator i = names.begin();
|