瀏覽代碼

Merge branch 'doc-pkgconfig-list' into release-3.9

Brad King 8 年之前
父節點
當前提交
70ec0f2ad1
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      Modules/FindPkgConfig.cmake

+ 7 - 1
Modules/FindPkgConfig.cmake

@@ -65,7 +65,7 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
     set(_pkgconfig_${_varname} "")
     set(_pkgconfig_${_varname} "")
     _pkgconfig_unset(${_prefix}_${_varname})
     _pkgconfig_unset(${_prefix}_${_varname})
   else()
   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 "")
     if (NOT ${_regexp} STREQUAL "")
       string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
       string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
@@ -86,6 +86,9 @@ endmacro()
 
 
     pkg_get_variable(<RESULT> <MODULE> <VARIABLE>)
     pkg_get_variable(<RESULT> <MODULE> <VARIABLE>)
 
 
+  If multiple values are returned variable will contain a
+  :ref:`;-list <CMake Language Lists>`.
+
   For example:
   For example:
 
 
   .. code-block:: cmake
   .. code-block:: cmake
@@ -524,6 +527,9 @@ endmacro()
     <XPREFIX> = <PREFIX>        for common case
     <XPREFIX> = <PREFIX>        for common case
     <XPREFIX> = <PREFIX>_STATIC for static linking
     <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
  There are some special variables whose prefix depends on the count of
  given modules.  When there is only one module, <PREFIX> stays
  given modules.  When there is only one module, <PREFIX> stays
  unchanged.  When there are multiple modules, the prefix will be
  unchanged.  When there are multiple modules, the prefix will be