summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-26 14:48:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-11-26 14:48:21 (GMT)
commitfd2ffb42aa8f8927f2ca3bf0c183957da88da2c0 (patch)
tree9331f377414ad36d096592f015c3a6425b097745
parent8b585eed447603579c438e7ff5216927cf6b0a69 (diff)
parentebeb31db2f7320fcccdfb077f6e86c7377b64d70 (diff)
downloadCMake-fd2ffb42aa8f8927f2ca3bf0c183957da88da2c0.zip
CMake-fd2ffb42aa8f8927f2ca3bf0c183957da88da2c0.tar.gz
CMake-fd2ffb42aa8f8927f2ca3bf0c183957da88da2c0.tar.bz2
Merge topic 'minor-cleanups'
ebeb31d Help: Fix typo in CMP0040 docs. 97b0abb Help: Fix typo in genex docs.
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst2
-rw-r--r--Help/policy/CMP0040.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 2a2b7dc..bd9e7c2 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -154,7 +154,7 @@ comparison::
generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target
property with each entry preceeded by ``-I``. Note that a more-complete use
-in this situation would be require first checking if the INCLUDE_DIRECTORIES
+in this situation would require first checking if the INCLUDE_DIRECTORIES
property is non-empty::
$<$<BOOL:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>>:-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>>
diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst
index 99b54ff..5d27f62 100644
--- a/Help/policy/CMP0040.rst
+++ b/Help/policy/CMP0040.rst
@@ -8,7 +8,7 @@ the TARGET signature of :command:`add_custom_command`
if the target is unknown.
The OLD behavior for this policy is to ignore custom commands
-for unknown targets. The NEW behavior for this policy is to report and error
+for unknown targets. The NEW behavior for this policy is to report an error
if the target referenced in :command:`add_custom_command` is unknown.
This policy was introduced in CMake version 3.0.0. CMake version