mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-14 10:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Prefer first ninja tool available in PATH

Browse Source 
We search for tools `ninja-build`, `ninja`, and `samu` as the build tool
for the Ninja generator.  Re-order the search to prefer whichever tool
appears first in the `PATH`.  This makes it easier for users to control
which tool gets used when more than one is available.

Fixes: #20028
This commit is contained in:
Brad King
2019-11-26 11:13:02 -05:00
parent ffe801062a
commit feb5cb8d9d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/dev/ninja-tool.rst Normal file
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.

1
Modules/CMakeNinjaFindMake.cmake
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)