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

changes to better handle old values or hand set values

Browse Source
This commit is contained in:
Ken Martin 2001-07-10 09:23:34 -04:00
parent b4462da66a
commit e0fa3f281c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmBuildNameCommand.cxx
View File

@ -52,9 +52,29 @@ bool cmBuildNameCommand::InitialPass(std::vector<std::string>& args)
= cmCacheManager::GetInstance()->GetCacheValue("BUILDNAME"); = cmCacheManager::GetInstance()->GetCacheValue("BUILDNAME");
if(cacheValue) if(cacheValue)
{ {
m_Makefile->AddDefinition("BUILDNAME", cacheValue); // do we need to correct the value?
cmRegularExpression reg("[()/]");
if (reg.find(cacheValue))
{
std::string cv = cacheValue;
cmSystemTools::ReplaceString(cv,"/", "_");
cmSystemTools::ReplaceString(cv,"(", "_");
cmSystemTools::ReplaceString(cv,")", "_");
cmCacheManager::GetInstance()->
AddCacheEntry("BUILDNAME",
cv.c_str(),
"Name of build.",
cmCacheManager::STRING);
m_Makefile->AddDefinition("BUILDNAME", cv.c_str());
}
else
{
m_Makefile->AddDefinition("BUILDNAME", cacheValue);
}
return true; return true;
} }
std::string buildname = "WinNT"; std::string buildname = "WinNT";
if(m_Makefile->GetDefinition("UNIX")) if(m_Makefile->GetDefinition("UNIX"))
{ {