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

ENH: look for nslookup and hostname in the right places

This commit is contained in:
Bill Hoffman 2002-04-26 09:35:03 -04:00
parent d49a5bac60
commit 4879c6cffa
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmSiteNameCommand.cxx
View File

@ -24,7 +24,14 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
this->SetError("called with incorrect number of arguments"); this->SetError("called with incorrect number of arguments");
return false; return false;
} }
std::vector<std::string> paths;
paths.push_back("/usr/bsd");
paths.push_back("/usr/sbin");
paths.push_back("/usr/bin");
paths.push_back("/bin");
paths.push_back("/sbin");
paths.push_back("/usr/local/bin");
const char* cacheValue const char* cacheValue
= m_Makefile->GetDefinition(args[0].c_str()); = m_Makefile->GetDefinition(args[0].c_str());
if(cacheValue) if(cacheValue)
@ -40,7 +47,7 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
} }
else else
{ {
hostname_cmd = cmSystemTools::FindProgram("hostname"); hostname_cmd = cmSystemTools::FindProgram("hostname", paths);
} }
std::string siteName = "unknown"; std::string siteName = "unknown";
@ -84,7 +91,7 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
} }
else else
{ {
nslookup_cmd = cmSystemTools::FindProgram("nslookup"); nslookup_cmd = cmSystemTools::FindProgram("nslookup", paths);
} }
// try to find the domain name for this computer // try to find the domain name for this computer