SITE_NAME should return the most qualified name of the host. If nslookup works, now the domain is appended to the hostname (whereas it *replaced* the host name before)
This commit is contained in:
parent
8fefb3dd22
commit
5cc95e4387
|
@ -90,13 +90,14 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
|
|||
std::string nsOutput;
|
||||
cmSystemTools::RunCommand(nsCmd.c_str(),
|
||||
nsOutput);
|
||||
|
||||
std::string RegExp = ".*Name:[ \t\n]*";
|
||||
RegExp += host;
|
||||
RegExp += "\\.([^ \t\n\r]*)[ \t\n\r]*Address:";
|
||||
cmRegularExpression reg( RegExp.c_str() );
|
||||
if(reg.find(nsOutput.c_str()))
|
||||
{
|
||||
siteName = cmSystemTools::LowerCase(reg.match(1));
|
||||
siteName += '.' + cmSystemTools::LowerCase(reg.match(1));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue