diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-29 13:18:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-29 13:18:35 (GMT) |
| commit | 5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231 (patch) | |
| tree | 9e05f2e59f7f28fe356108b4ac363474d57d3308 /Modules | |
| parent | a1c291e0ac2cfe62e394842192b12e9e092c5a0b (diff) | |
| parent | a15595e4c9ae27677180b0b5374ead7a754be1f7 (diff) | |
| download | CMake-5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231.zip CMake-5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231.tar.gz CMake-5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231.tar.bz2 | |
Merge topic 'samu'
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3380
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeNinjaFindMake.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeNinjaFindMake.cmake b/Modules/CMakeNinjaFindMake.cmake index 6a0c47e..702af13 100644 --- a/Modules/CMakeNinjaFindMake.cmake +++ b/Modules/CMakeNinjaFindMake.cmake @@ -3,6 +3,6 @@ find_program(CMAKE_MAKE_PROGRAM - NAMES ninja-build ninja + NAMES ninja-build ninja samu DOC "Program used to build from build.ninja files.") mark_as_advanced(CMAKE_MAKE_PROGRAM) |