diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 13:24:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-24 13:24:55 (GMT) |
| commit | 9b8685f7d05871421de576cd61b1bbdf7faaa92d (patch) | |
| tree | 1cd5c7499f9f4c05d719ece6ee52cfb714a9e704 | |
| parent | 533d10e48c530fe10bc199fa00596c2c87d24bf8 (diff) | |
| parent | 817db64c2c3b27098e0fd45825e29e01d784435a (diff) | |
| download | CMake-9b8685f7d05871421de576cd61b1bbdf7faaa92d.zip CMake-9b8685f7d05871421de576cd61b1bbdf7faaa92d.tar.gz CMake-9b8685f7d05871421de576cd61b1bbdf7faaa92d.tar.bz2 | |
Merge topic 'aix-streams'
817db64c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
| -rw-r--r-- | Source/cmExtraCodeLiteGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 946d9d2..cc42bca 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -454,7 +454,7 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const else if ( generator == "MinGW Makefiles" || generator == "Unix Makefiles" ) { - std::stringstream ss; + cmOStringStream ss; ss << make << " -j " << this->CpuCount; buildCommand = ss.str(); } @@ -482,7 +482,7 @@ cmExtraCodeLiteGenerator::GetSingleFileBuildCommand std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR"); if ( generator == "Unix Makefiles" || generator == "MinGW Makefiles" ) { - std::stringstream ss; + cmOStringStream ss; ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o"; buildCommand = ss.str(); } |