summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-12 16:24:50 -0400
committerBrad King <brad.king@kitware.com>2017-06-12 16:24:50 -0400
commit70ec0f2ad1d4acf6c7c9ab49c756985d468a1a69 (patch)
treedc4869200859e58a600fd4bb4188ff75686eff0c
parent05789144bdac1065d29d4c8fd41d75d338294e74 (diff)
parent70a6cb70f644b23acb99f1f6342728c8afb23d14 (diff)
downloadcmake-70ec0f2ad1d4acf6c7c9ab49c756985d468a1a69.tar.gz
Merge branch 'doc-pkgconfig-list' into release-3.9
-rw-r--r--Modules/FindPkgConfig.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 12a5ded835..a5357fa1c7 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -65,7 +65,7 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
set(_pkgconfig_${_varname} "")
_pkgconfig_unset(${_prefix}_${_varname})
else()
- string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
if (NOT ${_regexp} STREQUAL "")
string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
@@ -86,6 +86,9 @@ endmacro()
pkg_get_variable(<RESULT> <MODULE> <VARIABLE>)
+ If multiple values are returned variable will contain a
+ :ref:`;-list <CMake Language Lists>`.
+
For example:
.. code-block:: cmake
@@ -524,6 +527,9 @@ endmacro()
<XPREFIX> = <PREFIX> for common case
<XPREFIX> = <PREFIX>_STATIC for static linking
+ Every variable containing multiple values will be a
+ :ref:`;-list <CMake Language Lists>`.
+
There are some special variables whose prefix depends on the count of
given modules. When there is only one module, <PREFIX> stays
unchanged. When there are multiple modules, the prefix will be