Merge topic 'aix-streams'
817db64c
fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
This commit is contained in:
commit
9b8685f7d0
|
@ -454,7 +454,7 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
|
||||||
else if ( generator == "MinGW Makefiles" ||
|
else if ( generator == "MinGW Makefiles" ||
|
||||||
generator == "Unix Makefiles" )
|
generator == "Unix Makefiles" )
|
||||||
{
|
{
|
||||||
std::stringstream ss;
|
cmOStringStream ss;
|
||||||
ss << make << " -j " << this->CpuCount;
|
ss << make << " -j " << this->CpuCount;
|
||||||
buildCommand = ss.str();
|
buildCommand = ss.str();
|
||||||
}
|
}
|
||||||
|
@ -482,7 +482,7 @@ cmExtraCodeLiteGenerator::GetSingleFileBuildCommand
|
||||||
std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
|
std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
|
||||||
if ( generator == "Unix Makefiles" || generator == "MinGW Makefiles" )
|
if ( generator == "Unix Makefiles" || generator == "MinGW Makefiles" )
|
||||||
{
|
{
|
||||||
std::stringstream ss;
|
cmOStringStream ss;
|
||||||
ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o";
|
ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o";
|
||||||
buildCommand = ss.str();
|
buildCommand = ss.str();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue