summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-24 13:45:47 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-24 13:45:47 (GMT)
commitccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (patch)
treebd725b0ee02b42c32461d2c248c5823125d0b260 /Help
parent4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 (diff)
parent828d6c137d703ea095008fc6da794904a15c4ebd (diff)
downloadCMake-ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb.zip
CMake-ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb.tar.gz
CMake-ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb.tar.bz2
Merge topic 'extend-find-package-search-path'
828d6c13 find_package: Extend search path for combined Windows/UNIX convention ff5c89de Help: Widen find_package search path table
Diffstat (limited to 'Help')
-rw-r--r--Help/command/find_package.rst17
1 files changed, 10 insertions, 7 deletions
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 58dff9d..c44fe86 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -194,13 +194,16 @@ configuration file. The tables below show the directories searched.
Each entry is meant for installation trees following Windows (W), UNIX
(U), or Apple (A) conventions::
- <prefix>/ (W)
- <prefix>/(cmake|CMake)/ (W)
- <prefix>/<name>*/ (W)
- <prefix>/<name>*/(cmake|CMake)/ (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)
+ <prefix>/ (W)
+ <prefix>/(cmake|CMake)/ (W)
+ <prefix>/<name>*/ (W)
+ <prefix>/<name>*/(cmake|CMake)/ (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)
+ <prefix>/<name>*/(lib/<arch>|lib|share)/cmake/<name>*/ (W/U)
+ <prefix>/<name>*/(lib/<arch>|lib|share)/<name>*/ (W/U)
+ <prefix>/<name>*/(lib/<arch>|lib|share)/<name>*/(cmake|CMake)/ (W/U)
On systems supporting OS X Frameworks and Application Bundles the
following directories are searched for frameworks or bundles