浏览代码

Merge topic 'help_remove_duplicates'

32d7b0cc2c Help: Move entry to correct section in cmake-generator-expressions(7) manual
68b307caae Help: Add missing release notes for genex $<REMOVE_DUPLICATES:list>

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3200
Brad King 6 年之前
父节点
当前提交
4f07fdde26
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 2 2
      Help/manual/cmake-generator-expressions.7.rst
  2. 6 0
      Help/release/dev/remove_duplicates.rst

+ 2 - 2
Help/manual/cmake-generator-expressions.7.rst

@@ -88,8 +88,6 @@ String Comparisons
 ``$<IN_LIST:string,list>``
   ``1`` if ``string`` is member of the semicolon-separated ``list``, else ``0``.
   Uses case-sensitive comparisons.
-``$<REMOVE_DUPLICATES:list>``
-  Removes duplicated items in the given ``list``.
 ``$<VERSION_LESS:v1,v2>``
   ``1`` if ``v1`` is a version less than ``v2``, else ``0``.
 ``$<VERSION_GREATER:v1,v2>``
@@ -293,6 +291,8 @@ String Transformations
 
 ``$<JOIN:list,string>``
   Joins the list with the content of ``string``.
+``$<REMOVE_DUPLICATES:list>``
+  Removes duplicated items in the given ``list``.
 ``$<LOWER_CASE:string>``
   Content of ``string`` converted to lower case.
 ``$<UPPER_CASE:string>``

+ 6 - 0
Help/release/dev/remove_duplicates.rst

@@ -0,0 +1,6 @@
+remove_duplicates
+-----------------
+
+* A new ``$<REMOVE_DUPLICATES:list>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.