[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1763-g2cf5837
Rolf Eike Beer
eike at sf-mail.de
Thu Jan 24 18:24:01 EST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2cf583761296c5dc6b6202f4155e5a08f2d0d4d2 (commit)
via 6c57c31414b17028cfe2c393752458d5899f09a4 (commit)
from a699f1b55c92ea5387a6af75d30f2b075026fbfc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cf583761296c5dc6b6202f4155e5a08f2d0d4d2
commit 2cf583761296c5dc6b6202f4155e5a08f2d0d4d2
Merge: a699f1b 6c57c31
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 24 18:23:58 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 24 18:23:58 2013 -0500
Merge topic 'generator-expression-lf' into next
6c57c31 doc: fix linebreaks in generator expression documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c57c31414b17028cfe2c393752458d5899f09a4
commit 6c57c31414b17028cfe2c393752458d5899f09a4
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 24 22:04:09 2013 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 24 23:12:36 2013 +0100
doc: fix linebreaks in generator expression documentation
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" \
""
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentGeneratorExpressions.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list