diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2014-11-05 20:42:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-14 16:56:33 (GMT) |
| commit | f42d86f0b834c73b28a919ef1b4279753a6ec1bd (patch) | |
| tree | 69e16035448c6caad5c14d52ad85ae5787b6c260 /Source/cmNinjaUtilityTargetGenerator.cxx | |
| parent | f281ae01a2b89d8a7d327b3f6e73b727195d8dfd (diff) | |
| download | CMake-f42d86f0b834c73b28a919ef1b4279753a6ec1bd.zip CMake-f42d86f0b834c73b28a919ef1b4279753a6ec1bd.tar.gz CMake-f42d86f0b834c73b28a919ef1b4279753a6ec1bd.tar.bz2 | |
Ninja: Implement USES_TERMINAL using the console pool if available
Diffstat (limited to 'Source/cmNinjaUtilityTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaUtilityTargetGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index f5d18dc..c0a14ec 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -35,6 +35,8 @@ void cmNinjaUtilityTargetGenerator::Generate() &this->GetTarget()->GetPostBuildCommands() }; + bool uses_terminal = false; + for (unsigned i = 0; i != 2; ++i) { for (std::vector<cmCustomCommand>::const_iterator ci = cmdLists[i]->begin(); ci != cmdLists[i]->end(); ++ci) { @@ -42,6 +44,8 @@ void cmNinjaUtilityTargetGenerator::Generate() this->GetMakefile()); this->GetLocalGenerator()->AppendCustomCommandDeps(ccg, deps); this->GetLocalGenerator()->AppendCustomCommandLines(ccg, commands); + if (ci->GetUsesTerminal()) + uses_terminal = true; } } @@ -110,6 +114,7 @@ void cmNinjaUtilityTargetGenerator::Generate() command, desc, "Utility command for " + this->GetTargetName(), + uses_terminal, cmNinjaDeps(1, utilCommandName), deps); |