mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-21 07:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-tool'

Browse Source 
feb5cb8d9d Ninja: Prefer first ninja tool available in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4091
This commit is contained in:
Brad King
2019-12-04 19:17:57 +00:00
committed by Kitware Robot
parent 73848a75e8 feb5cb8d9d
commit f55593a607
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Help/release/dev/ninja-tool.rst
+7
View File
@@ -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.
Modules/CMakeNinjaFindMake.cmake
+1
View File
@@ -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)