summaryrefslogtreecommitdiffstats
path: root/Source/cmDocumentGeneratorExpressions.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-05-22 17:35:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-05-22 17:35:15 (GMT)
commit3db29d2724b9ed6cbbf5e2af668ecfb6ec365a3b (patch)
tree8c5378ec2c34c5e7bc5871e9cc346228aee333f4 /Source/cmDocumentGeneratorExpressions.h
parentee334b6a0a61ce7ed58fed405fa7900997c5747d (diff)
parenta7ba4520c7b15dc9f56d2c4718748b79b12c0c89 (diff)
downloadCMake-3db29d2724b9ed6cbbf5e2af668ecfb6ec365a3b.zip
CMake-3db29d2724b9ed6cbbf5e2af668ecfb6ec365a3b.tar.gz
CMake-3db29d2724b9ed6cbbf5e2af668ecfb6ec365a3b.tar.bz2
Merge topic 'join-genex'
a7ba452 Add the JOIN generator expression. 96ec314 Make it possible for any genex to have arbitrary content at the end. bd638ee Rename the method determining if a genex accepts arbitrary content. dc742fe Extract the ProcessArbitraryContent method.
Diffstat (limited to 'Source/cmDocumentGeneratorExpressions.h')
-rw-r--r--Source/cmDocumentGeneratorExpressions.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmDocumentGeneratorExpressions.h b/Source/cmDocumentGeneratorExpressions.h
index 7edc8ff..ae9ca50 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -28,6 +28,8 @@
"strings which contain a ',' for example.\n" \
" $<SEMICOLON> = A literal ';'. Used to prevent " \
"list expansion on an argument with ';'.\n" \
+ " $<JOIN:list,...> = joins the list with the content of " \
+ "\"...\"\n" \
" $<TARGET_NAME:...> = Marks ... as being the name of a " \
"target. This is required if exporting targets to multiple " \
"dependent export sets. The '...' must be a literal name of a " \