summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-13 13:20:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-06-13 13:20:34 (GMT)
commit5f704d992da3d8adb33481ec4cbec4ce49234add (patch)
treefac5ce31a6f2a7d862e835ef099aad1c13982caa /Modules
parent087b8ccda98af32480657d2e54b5395aac3b413f (diff)
parent70a6cb70f644b23acb99f1f6342728c8afb23d14 (diff)
downloadCMake-5f704d992da3d8adb33481ec4cbec4ce49234add.zip
CMake-5f704d992da3d8adb33481ec4cbec4ce49234add.tar.gz
CMake-5f704d992da3d8adb33481ec4cbec4ce49234add.tar.bz2
Merge topic 'doc-pkgconfig-list'
70a6cb70 FindPkgConfig: mention that variables will be ;-lists 6610fdbe FindPkgConfig: fix confusing indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !957
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindPkgConfig.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 12a5ded..a5357fa 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