diff options
author | Brad King <brad.king@kitware.com> | 2013-10-21 13:02:31 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-21 13:02:31 (GMT) |
commit | 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (patch) | |
tree | bb67786c603b6fdbfd4a7e17ecc25df0923a15fc /Help | |
parent | d06610888dd357a7085be0bfff86f5d5d291771d (diff) | |
parent | 187385a8edaaf907e449478706240236a84cd266 (diff) | |
download | CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.zip CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.tar.gz CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.tar.bz2 |
Merge topic 'minor-cleanups'
187385a cmCoreTryCompile: Fix typo in comments.
af2a3ab cmTarget: Remove unused variable.
620b0e9 target_link_libraries(): Fix code snippet in documentation.
2d4ce80 cmPolicies: Fix typo
d6dd264 include(): Use lower case and () to refer to the include() command.
Diffstat (limited to 'Help')
-rw-r--r-- | Help/command/target_link_libraries.rst | 3 | ||||
-rw-r--r-- | Help/policy/CMP0017.rst | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index a1e3e22..41265fd 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -59,10 +59,11 @@ for <target>: If an <item> is a library in a Mac OX framework, the Headers directory of the framework will also be processed as a "usage requirement". This has the same effect as passing the framework directory as an -include directory. target_link_libraries(<target> +include directory. :: + target_link_libraries(<target> <PRIVATE|PUBLIC|INTERFACE> <lib> ... [<PRIVATE|PUBLIC|INTERFACE> <lib> ... ] ...]) diff --git a/Help/policy/CMP0017.rst b/Help/policy/CMP0017.rst index c93e8b2..f74e6f0 100644 --- a/Help/policy/CMP0017.rst +++ b/Help/policy/CMP0017.rst @@ -11,7 +11,7 @@ the modules belonging to CMake always get those files included which they expect, and against which they were developed and tested. In all other cases, the files found in CMAKE_MODULE_PATH still take precedence over the ones in the CMake module directory. The OLD -behaviour is to always prefer files from CMAKE_MODULE_PATH over files +behavior is to always prefer files from CMAKE_MODULE_PATH over files from the CMake modules directory. This policy was introduced in CMake version 2.8.4. CMake version |