diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-05 12:52:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-05 12:53:09 (GMT) |
| commit | 9274bdff27fa620663da73dbd03e6a16dc42546f (patch) | |
| tree | fb9ac0093d916bc0f72392433917ab899bdabc80 /Help | |
| parent | ba2a9fb7651f374a2a335e22daabc940fb4bf24a (diff) | |
| parent | 19366408fe4fedaec19e7e964adb02d090e8c0b7 (diff) | |
| download | CMake-9274bdff27fa620663da73dbd03e6a16dc42546f.zip CMake-9274bdff27fa620663da73dbd03e6a16dc42546f.tar.gz CMake-9274bdff27fa620663da73dbd03e6a16dc42546f.tar.bz2 | |
Merge topic 'find_package-one-more-path'
19366408fe cmFindPackageCommand: Protect overrides of `cmDirectoryListGenerator`
e55c154c5b cmFindPackageCommand: Add one more search path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7542
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/find_package.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/find_package-one-more-path.rst | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index ee52c41..d6c5105 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -291,6 +291,7 @@ Each entry is meant for installation trees following Windows (``W``), UNIX <prefix>/(cmake|CMake)/ (W) <prefix>/<name>*/ (W) <prefix>/<name>*/(cmake|CMake)/ (W) + <prefix>/<name>*/(cmake|CMake)/<name>*/ (W) <prefix>/(lib/<arch>|lib*|share)/cmake/<name>*/ (U) <prefix>/(lib/<arch>|lib*|share)/<name>*/ (U) <prefix>/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/ (U) diff --git a/Help/release/dev/find_package-one-more-path.rst b/Help/release/dev/find_package-one-more-path.rst new file mode 100644 index 0000000..554b67d --- /dev/null +++ b/Help/release/dev/find_package-one-more-path.rst @@ -0,0 +1,6 @@ +find_package-one-more-path +-------------------------- + +* The :command:`find_package` command now considers paths of + the form ``<prefix>/<name>*/(cmake|CMake)/<name>*/`` when + searching for package configuration files. |