diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-04 19:17:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-04 19:18:23 (GMT) |
| commit | f55593a607782dd1ea7fa3f2c1cedca7a05c5ae4 (patch) | |
| tree | b1ac8e78e70b71023aa266464d352165718dd29b | |
| parent | 73848a75e84cd265acba897c6dc3ace3099a8bc9 (diff) | |
| parent | feb5cb8d9d9a334c34e8cc30c9970fd5d71d25fd (diff) | |
| download | CMake-f55593a607782dd1ea7fa3f2c1cedca7a05c5ae4.zip CMake-f55593a607782dd1ea7fa3f2c1cedca7a05c5ae4.tar.gz CMake-f55593a607782dd1ea7fa3f2c1cedca7a05c5ae4.tar.bz2 | |
Merge topic 'ninja-tool'
feb5cb8d9d Ninja: Prefer first ninja tool available in PATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4091
| -rw-r--r-- | Help/release/dev/ninja-tool.rst | 7 | ||||
| -rw-r--r-- | Modules/CMakeNinjaFindMake.cmake | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Help/release/dev/ninja-tool.rst b/Help/release/dev/ninja-tool.rst new file mode 100644 index 0000000..aa0292e --- /dev/null +++ b/Help/release/dev/ninja-tool.rst @@ -0,0 +1,7 @@ +ninja-tool +---------- + +* The :generator:`Ninja` generator now prefers the first ninja build + tool to appear in the ``PATH`` no matter whether it is called + ``ninja-build``, ``ninja``, or ``samu``. Previously the first + of those names to appear anywhere in the ``PATH`` would be preferred. diff --git a/Modules/CMakeNinjaFindMake.cmake b/Modules/CMakeNinjaFindMake.cmake index 702af13..32f78da 100644 --- a/Modules/CMakeNinjaFindMake.cmake +++ b/Modules/CMakeNinjaFindMake.cmake @@ -4,5 +4,6 @@ find_program(CMAKE_MAKE_PROGRAM NAMES ninja-build ninja samu + NAMES_PER_DIR DOC "Program used to build from build.ninja files.") mark_as_advanced(CMAKE_MAKE_PROGRAM) |