FIX: BuildName removes path to compiler and converts any illegal characters
This commit is contained in:
parent
6307ffbb65
commit
c453f2fc7a
|
@ -68,18 +68,18 @@ bool cmBuildNameCommand::InitialPass(std::vector<std::string>& args)
|
||||||
if(reg.find(buildname.c_str()))
|
if(reg.find(buildname.c_str()))
|
||||||
{
|
{
|
||||||
buildname = reg.match(1) + "-" + reg.match(2);
|
buildname = reg.match(1) + "-" + reg.match(2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
std::string compiler = "-${CMAKE_CXX_COMPILER}";
|
||||||
|
m_Makefile->ExpandVariablesInString ( compiler );
|
||||||
|
buildname += cmSystemTools::GetFilenameName(compiler);
|
||||||
cmSystemTools::ReplaceString(buildname,
|
cmSystemTools::ReplaceString(buildname,
|
||||||
"/", "_");
|
"/", "_");
|
||||||
cmSystemTools::ReplaceString(buildname,
|
cmSystemTools::ReplaceString(buildname,
|
||||||
"(", "_");
|
"(", "_");
|
||||||
cmSystemTools::ReplaceString(buildname,
|
cmSystemTools::ReplaceString(buildname,
|
||||||
")", "_");
|
")", "_");
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
std::string compiler = "-${CMAKE_CXX_COMPILER}";
|
|
||||||
m_Makefile->ExpandVariablesInString ( compiler );
|
|
||||||
buildname += compiler;
|
|
||||||
|
|
||||||
cmCacheManager::GetInstance()->
|
cmCacheManager::GetInstance()->
|
||||||
AddCacheEntry("BUILDNAME",
|
AddCacheEntry("BUILDNAME",
|
||||||
|
|
Loading…
Reference in New Issue