diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-24 13:52:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-24 13:52:29 (GMT) |
| commit | 8c0bbd37df52900678b3a85b146d7a7f65cba374 (patch) | |
| tree | c7de2d10a8086f2327eeeef0a79c6e44e5617e7b | |
| parent | c10e981fd072258a28822a373bf7a270d31ef181 (diff) | |
| parent | f3f49ff7a915daebdbc114599e862627e3731979 (diff) | |
| download | CMake-8c0bbd37df52900678b3a85b146d7a7f65cba374.zip CMake-8c0bbd37df52900678b3a85b146d7a7f65cba374.tar.gz CMake-8c0bbd37df52900678b3a85b146d7a7f65cba374.tar.bz2 | |
Merge topic 'minor-cleanups'
f3f49ff Docs: Fix typo
b0686fd Docs: Fix typo.
| -rw-r--r-- | Help/command/target_compile_options.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Help/command/target_compile_options.rst b/Help/command/target_compile_options.rst index 88a4ea3..71d57f9 100644 --- a/Help/command/target_compile_options.rst +++ b/Help/command/target_compile_options.rst @@ -18,7 +18,7 @@ The INTERFACE, PUBLIC and PRIVATE keywords are required to specify the scope of the following arguments. PRIVATE and PUBLIC items will populate the COMPILE_OPTIONS property of <target>. PUBLIC and INTERFACE items will populate the INTERFACE_COMPILE_OPTIONS property -of <target>. The following arguments specify compile opitions. +of <target>. The following arguments specify compile options. Repeated calls for the same <target> append items in the order called. Arguments to target_compile_options may use "generator expressions" diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst index 7f95ef0..f259940 100644 --- a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst +++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst @@ -9,7 +9,7 @@ boolean in the INTERFACE of all linked dependees. For example, if a property "FOO" appears in the list, then for each dependee, the "INTERFACE_FOO" property content in all of its dependencies must be consistent with each other, and with the "FOO" property in the -dependee. Consistency in this sense has the meaning that if the +depender. Consistency in this sense has the meaning that if the property is set, then it must have the same boolean value as all others, and if the property is not set, then it is ignored. Note that for each dependee, the set of properties from this property must not diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst index a461f76..68de2e2 100644 --- a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst +++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst @@ -8,7 +8,7 @@ properties for this target which must be the same when evaluated as a string in the INTERFACE of all linked dependees. For example, if a property "FOO" appears in the list, then for each dependee, the "INTERFACE_FOO" property content in all of its dependencies must be -equal with each other, and with the "FOO" property in the dependee. +equal with each other, and with the "FOO" property in the depender. If the property is not set, then it is ignored. Note that for each dependee, the set of properties from this property must not intersect with the set of properties from the COMPATIBLE_INTERFACE_BOOL |