ngompa / rpms / cmake

Forked from rpms/cmake 4 years ago
Clone
145919
diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake
145919
--- cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja	2012-11-27 06:26:32.000000000 -0700
145919
+++ cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake	2013-02-08 09:30:26.437739370 -0700
145919
@@ -12,6 +12,6 @@
145919
 # (To distribute this file outside of CMake, substitute the full
145919
 #  License text for the above reference.)
145919
 
145919
-find_program(CMAKE_MAKE_PROGRAM ninja
145919
+find_program(CMAKE_MAKE_PROGRAM ninja-build
145919
   DOC "Program used to build from build.ninja files.")
145919
 mark_as_advanced(CMAKE_MAKE_PROGRAM)
145919
diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx
145919
--- cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja	2012-11-27 06:26:33.000000000 -0700
145919
+++ cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx	2013-02-08 09:32:30.397949661 -0700
145919
@@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj
145919
              lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"),
145919
                                     cmLocalGenerator::SHELL);
145919
   }
145919
-  return "ninja";
145919
+  return "ninja-build";
145919
 }
145919
 
145919
 void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)