diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-11 12:27:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-11 12:28:05 (GMT) |
| commit | f13d4b10775cd4d6a604a7f1b013b5d064864a41 (patch) | |
| tree | 63fce951abaad4279eb6daaefe592bbcf5894223 /Help/command/FIND_XXX.txt | |
| parent | e9f72e9c94e17758aada77c5ba05502739242432 (diff) | |
| parent | ab2e35d6144c6e666eb0cfffe144d2b93c72949b (diff) | |
| download | CMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.zip CMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.tar.gz CMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.tar.bz2 | |
Merge topic 'replace-os-x-name-with-macos'
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !2351
Diffstat (limited to 'Help/command/FIND_XXX.txt')
| -rw-r--r-- | Help/command/FIND_XXX.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index 38c231a..73dbd57 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -137,7 +137,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: .. |FIND_ARGS_XXX| replace:: <VAR> NAMES name -On OS X the :variable:`CMAKE_FIND_FRAMEWORK` and +On macOS the :variable:`CMAKE_FIND_FRAMEWORK` and :variable:`CMAKE_FIND_APPBUNDLE` variables determine the order of preference between Apple-style and unix-style package components. |