diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 14:01:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-12 14:01:10 (GMT) |
| commit | f3ad57d25e293f84205d74b40744301f65f472e8 (patch) | |
| tree | fdde499fdd1262f97a02dec2459373082906cf3f | |
| parent | 1f41ec2ac21e75efc91bea0a786f9b2fb69e67a0 (diff) | |
| parent | 8435088d6a387847bf58c3805424bd82ad6e09ca (diff) | |
| download | CMake-f3ad57d25e293f84205d74b40744301f65f472e8.zip CMake-f3ad57d25e293f84205d74b40744301f65f472e8.tar.gz CMake-f3ad57d25e293f84205d74b40744301f65f472e8.tar.bz2 | |
Merge branch 'doc-CMAKE_FIND_PACKAGE_NAME' into release
| -rw-r--r-- | Help/command/find_package.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/variable/CMAKE_FIND_PACKAGE_NAME.rst | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 190d05c..7f518a6 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -312,6 +312,8 @@ When loading a find module or package configuration file ``find_package`` defines variables to provide information about the call arguments (and restores their original state before returning): +``CMAKE_FIND_PACKAGE_NAME`` + the ``<package>`` name which is searched for ``<package>_FIND_REQUIRED`` true if ``REQUIRED`` option was given ``<package>_FIND_QUIETLY`` diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 99088e0..2a22f14 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -36,6 +36,7 @@ Variables that Provide Information /variable/CMAKE_EXECUTABLE_SUFFIX /variable/CMAKE_EXTRA_GENERATOR /variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES + /variable/CMAKE_FIND_PACKAGE_NAME /variable/CMAKE_GENERATOR /variable/CMAKE_GENERATOR_PLATFORM /variable/CMAKE_GENERATOR_TOOLSET diff --git a/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst b/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst new file mode 100644 index 0000000..bd1a30f --- /dev/null +++ b/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst @@ -0,0 +1,6 @@ +CMAKE_FIND_PACKAGE_NAME +----------------------- + +Defined by the :command:`find_package` command while loading +a find module to record the caller-specified package name. +See command documentation for details. |