[Cmake-commits] CMake branch, next, updated. v2.8.9-1157-g1e74f07

[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  1e74f075c3e155a78da01aef2e913718a0c7a070 (commit)
       via  e890ff79196ba302fe3dce9081c6af24f7e66d40 (commit)
      from  4436043f1fc43c8742da7710edb41e6cee230655 (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=1e74f075c3e155a78da01aef2e913718a0c7a070
commit 1e74f075c3e155a78da01aef2e913718a0c7a070
Merge: 4436043 e890ff7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 09:56:26 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 19 09:56:26 2012 -0400

    Merge topic 'expand-LOCATION-documentation' into next
    
    e890ff7 Revert "Document a limitation of the LOCATION target property."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e890ff79196ba302fe3dce9081c6af24f7e66d40
commit e890ff79196ba302fe3dce9081c6af24f7e66d40
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 15:50:55 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 19 15:50:55 2012 +0200

    Revert "Document a limitation of the LOCATION target property."
    
    This reverts commit 6bbcb313d0698ecde67637fe2e84d082fea9482e.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 429369d..423b350 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -621,12 +621,7 @@ void cmTarget::DefineProperties(cmake *cm)
      "target location.  "
      "In CMake 2.8.4 and above add_custom_command recognizes generator "
      "expressions to refer to target locations anywhere in the command.  "
-     "Therefore this property is not needed for creating custom commands.  \n"
-     "Note that for non-imported targets, the reported value of the LOCATION "
-     "property may be incorrect, as the final location depends on the "
-     "LINKER_LANGUAGE of the target.  The LINKER_LANGUAGE property is "
-     "usually computed, but can be explicitly set where needed if the "
-     "LOCATION value is otherwise incorrect."
+     "Therefore this property is not needed for creating custom commands."
      CM_LOCATION_UNDEFINED_BEHAVIOR("reading this property"));
 
   cm->DefineProperty

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

Summary of changes:
 Source/cmTarget.cxx |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake