diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-08 14:24:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-08 14:24:36 (GMT) |
| commit | 4da3315db365f3c80ce5202047955f0f2ec9312f (patch) | |
| tree | 0446f74abab8d3a7a15996e27747d45f1a884c05 /Help | |
| parent | 20b7e79d211589eed2668474966e77d00025eb37 (diff) | |
| parent | 8ea7611bc3650c75c86d22a3127cb117dbcaa9be (diff) | |
| download | CMake-4da3315db365f3c80ce5202047955f0f2ec9312f.zip CMake-4da3315db365f3c80ce5202047955f0f2ec9312f.tar.gz CMake-4da3315db365f3c80ce5202047955f0f2ec9312f.tar.bz2 | |
Merge topic 'find_program-NAMES_PER_DIR'
8ea7611b find_program: Optionally consider all names in each directory
fc1990c9 cmFindProgramCommand: Re-implement search using more flexible approach
fdbfc9f6 Tests: Add explicit testing for find_program
907a919b cmSystemTools: Drop unused StringEndsWith method
ed4de3c9 cmFindProgramCommand: Use Names member instead of passing it
bf32b95e cmFindLibraryCommand: Avoid repeating search for the same name
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/find_program.rst | 7 | ||||
| -rw-r--r-- | Help/release/dev/find_program-NAMES_PER_DIR.rst | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Help/command/find_program.rst b/Help/command/find_program.rst index 2a5ce9a..d3430c0 100644 --- a/Help/command/find_program.rst +++ b/Help/command/find_program.rst @@ -2,7 +2,7 @@ find_program ------------ .. |FIND_XXX| replace:: find_program -.. |NAMES| replace:: NAMES name1 [name2 ...] +.. |NAMES| replace:: NAMES name1 [name2 ...] [NAMES_PER_DIR] .. |SEARCH_XXX| replace:: program .. |SEARCH_XXX_DESC| replace:: program .. |prefix_XXX_SUBDIR| replace:: ``<prefix>/[s]bin`` @@ -26,3 +26,8 @@ find_program :variable:`CMAKE_FIND_ROOT_PATH_MODE_PROGRAM` .. include:: FIND_XXX.txt + +When more than one value is given to the ``NAMES`` option this command by +default will consider one name at a time and search every directory +for it. The ``NAMES_PER_DIR`` option tells this command to consider one +directory at a time and search for all names in it. diff --git a/Help/release/dev/find_program-NAMES_PER_DIR.rst b/Help/release/dev/find_program-NAMES_PER_DIR.rst new file mode 100644 index 0000000..04cd170 --- /dev/null +++ b/Help/release/dev/find_program-NAMES_PER_DIR.rst @@ -0,0 +1,6 @@ +find_program-NAMES_PER_DIR +-------------------------- + +* The :command:`find_program` command learned a ``NAMES_PER_DIR`` + option to consdier all given ``NAMES`` in each directory before + moving on to the next directory. |