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/command | |
| 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/command')
| -rw-r--r-- | Help/command/FIND_XXX.txt | 2 | ||||
| -rw-r--r-- | Help/command/find_package.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index fc8c55e..40f1c1a 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -90,7 +90,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: i.e. ``<CurrentPackage>_ROOT``, ``ENV{<CurrentPackage>_ROOT}``, ``<ParentPackage>_ROOT``, ``ENV{<ParentPackage>_ROOT}``, etc. This can be skipped if ``NO_PACKAGE_ROOT_PATH`` is passed or by setting - the :variable:`CMAKE_FIND_USE_PACAKGE_ROOT_PATH` to ``FALSE``. + the :variable:`CMAKE_FIND_USE_PACKAGE_ROOT_PATH` to ``FALSE``. See policy :policy:`CMP0074`. * |FIND_PACKAGE_ROOT_PREFIX_PATH_XXX| diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index e5e5b2c..6e1d232 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -330,8 +330,10 @@ enabled. 6. Search paths stored in the CMake :ref:`User Package Registry`. This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed or by - setting the :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` - to ``TRUE``. + setting the variable :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` + to ``FALSE`` or the deprecated variable + :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` to ``TRUE``. + See the :manual:`cmake-packages(7)` manual for details on the user package registry. |