diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-05 11:55:31 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-05 06:55:36 -0500 |
| commit | f0257a87a3c282e2ea0c0a06556d4fedeb4cfe95 (patch) | |
| tree | 686cb70d7ffdfac412c17016b0e9f038d5f012b6 | |
| parent | 7a76b4b19d14061976212d6189ecd8bbf3fc36b4 (diff) | |
| parent | c40e81ce8023f4b21860ae94adeddcf78ed2f935 (diff) | |
| download | cmake-f0257a87a3c282e2ea0c0a06556d4fedeb4cfe95.tar.gz | |
Merge topic 'doc-find-env-vars' into release-3.19
c40e81ce80 Help: Restore docs that find_library considers LIB, not INCLUDE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5772
| -rw-r--r-- | Help/command/find_file.rst | 3 | ||||
| -rw-r--r-- | Help/command/find_library.rst | 3 | ||||
| -rw-r--r-- | Help/command/find_path.rst | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Help/command/find_file.rst b/Help/command/find_file.rst index 3f03f37e37..39dfb85828 100644 --- a/Help/command/find_file.rst +++ b/Help/command/find_file.rst @@ -17,7 +17,8 @@ find_file .. |CMAKE_XXX_PATH| replace:: :variable:`CMAKE_INCLUDE_PATH` .. |CMAKE_XXX_MAC_PATH| replace:: :variable:`CMAKE_FRAMEWORK_PATH` -.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``PATH`` and ``INCLUDE``. +.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``INCLUDE`` + and ``PATH``. .. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: ``<prefix>/include/<arch>`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst index 8a55aca3db..ab957ce9be 100644 --- a/Help/command/find_library.rst +++ b/Help/command/find_library.rst @@ -17,7 +17,8 @@ find_library .. |CMAKE_XXX_PATH| replace:: :variable:`CMAKE_LIBRARY_PATH` .. |CMAKE_XXX_MAC_PATH| replace:: :variable:`CMAKE_FRAMEWORK_PATH` -.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``PATH`` and ``INCLUDE``. +.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``LIB`` + and ``PATH``. .. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: ``<prefix>/lib/<arch>`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. diff --git a/Help/command/find_path.rst b/Help/command/find_path.rst index 52ffe3c795..ec66771076 100644 --- a/Help/command/find_path.rst +++ b/Help/command/find_path.rst @@ -17,7 +17,8 @@ find_path .. |CMAKE_XXX_PATH| replace:: :variable:`CMAKE_INCLUDE_PATH` .. |CMAKE_XXX_MAC_PATH| replace:: :variable:`CMAKE_FRAMEWORK_PATH` -.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``PATH`` and ``INCLUDE``. +.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``INCLUDE`` + and ``PATH``. .. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: ``<prefix>/include/<arch>`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. |