summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-01-25 18:38:13 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-01-25 18:38:13 (GMT)
commitaa6ad9c903c95f7e1112d52925d217d8cb54b62f (patch)
tree08f14cbfa1aa5c14f3b550c611ac9fd7909eb39a
parentc29dd4fa76c77830eb2b001867b8e2fcab87e829 (diff)
parent6c57c31414b17028cfe2c393752458d5899f09a4 (diff)
downloadCMake-aa6ad9c903c95f7e1112d52925d217d8cb54b62f.zip
CMake-aa6ad9c903c95f7e1112d52925d217d8cb54b62f.tar.gz
CMake-aa6ad9c903c95f7e1112d52925d217d8cb54b62f.tar.bz2
Merge topic 'generator-expression-lf'
6c57c31 doc: fix linebreaks in generator expression documentation
-rw-r--r--Source/cmDocumentGeneratorExpressions.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmDocumentGeneratorExpressions.h b/Source/cmDocumentGeneratorExpressions.h
index c2bf423..be9f2ff 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -47,9 +47,10 @@
" $<TARGET_LINKER_FILE_DIR:tgt>/$<TARGET_LINKER_FILE_NAME:tgt>\n" \
" $<TARGET_SONAME_FILE_DIR:tgt>/$<TARGET_SONAME_FILE_NAME:tgt>\n" \
"\n" \
- " $<TARGET_PROPERTY:tgt,prop> = The value of the property prop\n" \
- "on the target tgt. Note that tgt is not added as a dependency of\n" \
- "the target this expression is evaluated on.\n" \
+ " $<TARGET_PROPERTY:tgt,prop> = The value of the property prop " \
+ "on the target tgt.\n" \
+ "Note that tgt is not added as a dependency of the target this " \
+ "expression is evaluated on.\n" \
" $<TARGET_POLICY:pol> = '1' if the policy was NEW when " \
"the 'head' target was created, else '0'. If the policy was not " \
"set, the warning message for the policy will be emitted. This " \
@@ -64,7 +65,7 @@
#define CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS \
CM_DOCUMENT_ADD_TEST_GENERATOR_EXPRESSIONS \
"Expressions with an implicit 'this' target:\n" \
- " $<TARGET_PROPERTY:prop> = The value of the property prop on\n" \
+ " $<TARGET_PROPERTY:prop> = The value of the property prop on " \
"the target on which the generator expression is evaluated.\n" \
""