| diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake |
| |
| |
| @@ -12,6 +12,6 @@ |
| # (To distribute this file outside of CMake, substitute the full |
| # License text for the above reference.) |
| |
| -find_program(CMAKE_MAKE_PROGRAM ninja |
| +find_program(CMAKE_MAKE_PROGRAM ninja-build |
| DOC "Program used to build from build.ninja files.") |
| mark_as_advanced(CMAKE_MAKE_PROGRAM) |
| diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx |
| |
| |
| @@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj |
| lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"), |
| cmLocalGenerator::SHELL); |
| } |
| - return "ninja"; |
| + return "ninja-build"; |
| } |
| |
| void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os) |