diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-07-09 23:32:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-09 23:32:54 (GMT) |
| commit | f7eb76501224a028c2e2bcacaef6018ece7b3738 (patch) | |
| tree | a9789c4759728e3fd3a3c634bfdd567d4907e5de /Help/manual | |
| parent | f374ffb14b3e55bbee8e7bb0eb3e5a33ee3612f1 (diff) | |
| parent | 447a96f5905ed1fb0ef17a8732cac7014da99cf6 (diff) | |
| download | CMake-f7eb76501224a028c2e2bcacaef6018ece7b3738.zip CMake-f7eb76501224a028c2e2bcacaef6018ece7b3738.tar.gz CMake-f7eb76501224a028c2e2bcacaef6018ece7b3738.tar.bz2 | |
Merge topic 'add_cmake_find_use_package_registry'
447a96f590 vim: Update cmake.vim to include the CMAKE_FIND_USE variables
1d00ba9ccf Find: find_package prefers variable CMAKE_FIND_USE_REGISTRY
704e3a2ca8 Find: Correct spelling and layout issues in CMAKE_FIND_USE_ docs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3487
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-packages.7.rst | 9 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index f5aa42d..4b2934a 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -654,8 +654,13 @@ allows one to disable them using the following variables: :command:`export(PACKAGE)` populates the user package registry unless the :variable:`CMAKE_EXPORT_NO_PACKAGE_REGISTRY` variable explicitly disables it. -* :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` disables the - User Package Registry in all the :command:`find_package` calls. +* :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` disables the + User Package Registry in all the :command:`find_package` calls when + set to ``FALSE``. +* Deprecated :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` disables the + User Package Registry in all the :command:`find_package` calls when set + to ``TRUE``. This variable is ignored when + :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` has been set. * :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` disables the System Package Registry in all the :command:`find_package` calls. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index d4dbcca..13c4990 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -184,7 +184,8 @@ Variables that Change Behavior /variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH /variable/CMAKE_FIND_USE_CMAKE_PATH /variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH - /variable/CMAKE_FIND_USE_PACAKGE_ROOT_PATH + /variable/CMAKE_FIND_USE_PACKAGE_REGISTRY + /variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH /variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH /variable/CMAKE_FRAMEWORK_PATH /variable/CMAKE_IGNORE_PATH |