diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-15 01:43:08 +0200 |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-15 01:43:08 +0200 |
| commit | f13a6a087e3f882b496ab34c12cc7777795a5c2f (patch) | |
| tree | 066b0826fb9de8745052447f8ee1ef65d8262d3a /Source/cmLocalNinjaGenerator.cxx | |
| parent | 555bda4e436435c37690aa5f31f4d254793d5b4e (diff) | |
| download | cmake-f13a6a087e3f882b496ab34c12cc7777795a5c2f.tar.gz | |
Ninja: undo all the NOSHELL patches
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 71f0913439..5d193cde41 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -264,14 +264,6 @@ void cmLocalNinjaGenerator::AppendCustomCommandDeps(const cmCustomCommand *cc, } } -std::string cmLocalNinjaGenerator::nopCommand() const { -#ifdef _WIN32 - return "cd ."; -#else - return ":"; -#endif -} - std::string cmLocalNinjaGenerator::BuildCommandLine( const std::vector<std::string> &cmdLines) { @@ -280,10 +272,9 @@ std::string cmLocalNinjaGenerator::BuildCommandLine( // don't use POST_BUILD. if (cmdLines.empty()) #ifdef _WIN32 - return ""; + return "cd."; #else - // TODO use _NOSHELL rule also on Linux - return nopCommand(); + return ":"; #endif std::ostringstream cmd; |