[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2630-g3167c36

[Stephen Kelly]

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  3167c36e576b4c9cb8011b6e862278575ea2f8ba (commit)
       via  2e80f9f21f258aeca1537c0a1bafba5c4bdb623c (commit)
      from  2c0e2cd8f961efa75cebe042fd40375d8e2f8327 (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=3167c36e576b4c9cb8011b6e862278575ea2f8ba
commit 3167c36e576b4c9cb8011b6e862278575ea2f8ba
Merge: 2c0e2cd 2e80f9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 25 14:34:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 25 14:34:46 2013 -0400

    Merge topic 'fix-new-target-commands-docs' into next
    
    2e80f9f Fix new target commands documentation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e80f9f21f258aeca1537c0a1bafba5c4bdb623c
commit 2e80f9f21f258aeca1537c0a1bafba5c4bdb623c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 25 19:23:01 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 25 19:23:01 2013 +0100

    Fix new target commands documentation.
    
    The target_include_directories and target_compile_defintions commands
    accepted targets as arguments until commit f6b16d4b (Don't allow
    targets args in the new target commands., 2013-01-29). This followed
    from discussion on the mailing list (target_include_directories() accepts
    only absolute paths ?, 2013-01-28):
    
     http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/5925/focus=5948
    
     http://public.kitware.com/pipermail/cmake-developers/2013-January/006301.html
    
    It was also decided to allow relative paths in target_include_directories().

diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h
index c93cacb..ec9b071 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -56,8 +56,7 @@ public:
       "  target_compile_definitions(<target> "
       "<INTERFACE|PUBLIC|PRIVATE> [items1...]\n"
       "    [<INTERFACE|PUBLIC|PRIVATE> [items2...] ...])\n"
-      "Specify compile definitions or targets to use when compiling a given "
-      "target.  "
+      "Specify compile definitions to use when compiling a given target.  "
       "The named <target> must have been created by a command such as "
       "add_executable or add_library and must not be an IMPORTED target.  "
       "The INTERFACE, PUBLIC and PRIVATE keywords are required to specify "
@@ -65,8 +64,7 @@ public:
       "populate the COMPILE_DEFINITIONS property of <target>.  PUBLIC and "
       "INTERFACE items will populate the INTERFACE_COMPILE_DEFINITIONS "
       "property of <target>.   "
-      "The non-scope arguments specify compile definitions or targets to use "
-      "INTERFACE_COMPILE_DEFINITIONS from.  "
+      "The following arguments specify compile definitions.  "
       "Repeated calls for the same <target> append items in the order called."
       "\n"
       "Arguments to target_compile_definitions may use \"generator "
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index 2bc7bef..e4bc9cf 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -68,9 +68,8 @@ public:
       "populate the INCLUDE_DIRECTORIES property of <target>.  PUBLIC and "
       "INTERFACE items will populate the INTERFACE_INCLUDE_DIRECTORIES "
       "property of <target>.   "
-      "The non-scope arguments specify either include directories or targets "
-      "to use INTERFACE_INCLUDE_DIRECTORIES from.  Any specified include "
-      "directories must be absolute paths, not relative paths.  "
+      "The following arguments specify include directories.  Specified "
+      "include directories may be absolute paths or relative paths.  "
       "Repeated calls for the same <target> append items in the order called."
       "\n"
       "Arguments to target_include_directories may use \"generator "

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTargetCompileDefinitionsCommand.h |    6 ++----
 Source/cmTargetIncludeDirectoriesCommand.h |    5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake