diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-30 18:11:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-30 18:11:59 (GMT) |
| commit | f2746f2ebec8f929986f5a7abc5e9285a7553097 (patch) | |
| tree | 1357935f52f90a40a0a2019ba8cbaad67714503c | |
| parent | 5e27e6f896976e1d167548f740f46d1477c8c48c (diff) | |
| parent | f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 (diff) | |
| download | CMake-f2746f2ebec8f929986f5a7abc5e9285a7553097.zip CMake-f2746f2ebec8f929986f5a7abc5e9285a7553097.tar.gz CMake-f2746f2ebec8f929986f5a7abc5e9285a7553097.tar.bz2 | |
Merge topic 'dev/alternate-generator-binaries'
f04e0a2b ninja: Find alternate Ninja-compatible binaries
| -rw-r--r-- | Modules/CMakeNinjaFindMake.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeNinjaFindMake.cmake b/Modules/CMakeNinjaFindMake.cmake index c3ca767..2f35cf4 100644 --- a/Modules/CMakeNinjaFindMake.cmake +++ b/Modules/CMakeNinjaFindMake.cmake @@ -12,6 +12,7 @@ # (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 + NAMES ninja-build ninja DOC "Program used to build from build.ninja files.") mark_as_advanced(CMAKE_MAKE_PROGRAM) |