[Cmake-commits] CMake branch, next, updated. v2.8.8-2936-g6204b04

[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  6204b042c1e7e34a8807db00e611b20446d54bb7 (commit)
       via  bdc6e32d322a0ef0da39c52e46a53056c592697d (commit)
      from  95da6ab22b9a965df824f5e9d5e13fa77a70c2ca (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=6204b042c1e7e34a8807db00e611b20446d54bb7
commit 6204b042c1e7e34a8807db00e611b20446d54bb7
Merge: 95da6ab bdc6e32
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 25 16:33:45 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 25 16:33:45 2012 -0400

    Merge topic 'IMPORTED_LOCATION_CONFIG-docs' into next
    
    bdc6e32 Update the docs of IMPORTED_LOCATION_CONFIG to match the code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdc6e32d322a0ef0da39c52e46a53056c592697d
commit bdc6e32d322a0ef0da39c52e46a53056c592697d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 17 12:47:29 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 25 12:22:27 2012 +0200

    Update the docs of IMPORTED_LOCATION_CONFIG to match the code.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c9bb006..c5ef9ff 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -700,9 +700,9 @@ void cmTarget::DefineProperties(cmake *cm)
      "Setting this property tells CMake what imported configurations are "
      "suitable for use when building the <CONFIG> configuration.  "
      "The first configuration in the list found to be provided by the "
-     "imported target is selected.  If no matching configurations are "
-     "available the imported target is considered to be not found.  "
-     "This property is ignored for non-imported targets.",
+     "imported target is selected.  If this property is set and no matching "
+     "configurations are available, then the imported target is considered "
+     "to be not found.  This property is ignored for non-imported targets.",
      false /* TODO: make this chained */ );
 
   cm->DefineProperty

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

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


hooks/post-receive
-- 
CMake