Commit d2c2cf32 authored by Jim Miller's avatar Jim Miller

FIX: added AddDefinition() to store site name and build name in makefile. Also stripped

     white space from the result of hostname.
parent c40e8c50
......@@ -86,6 +86,8 @@ bool cmBuildNameCommand::InitialPass(std::vector<std::string>& args)
buildname.c_str(),
"Name of build.",
cmCacheManager::STRING);
m_Makefile->AddDefinition("BUILDNAME", buildname.c_str());
return true;
}
......@@ -69,9 +69,22 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string>& args)
std::string host;
cmSystemTools::RunCommand(hostname,
host);
if (host.length())
{
// remove any white space from the host name
std::string hostRegExp = "[ \t\n\r]*([^\t\n\r ]*)[ \t\n\r]*";
cmRegularExpression hostReg (hostRegExp.c_str());
if (hostReg.find(host.c_str()))
{
// strip whitespace
host = hostReg.match(1);
}
}
std::string siteName = host;
if(host.length())
{
// try to find the domain name for this computer
std::string nsCmd = nslookup;
nsCmd += " ";
nsCmd += host;
......@@ -93,6 +106,8 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string>& args)
siteName.c_str(),
"Name of the computer/site where compile is being run",
cmCacheManager::STRING);
m_Makefile->AddDefinition("SITE", siteName.c_str());
return true;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment