[Cmake-commits] CMake branch, next, updated. v2.8.3-649-g417739a

[Brad King]

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  417739a991351c2e0b3138ee9a756e95865bd2ce (commit)
       via  5fe3ac86ee1702d957621c2054507eed2c393c6f (commit)
      from  0166ccc7294aab30d1eb8323172c11db34ade416 (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=417739a991351c2e0b3138ee9a756e95865bd2ce
commit 417739a991351c2e0b3138ee9a756e95865bd2ce
Merge: 0166ccc 5fe3ac8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 18 08:16:11 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 18 08:16:11 2010 -0500

    Merge topic 'link-library-parse-regex' into next
    
    5fe3ac8 Prefer non-empty prefixes when matching lib names (#11468)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fe3ac86ee1702d957621c2054507eed2c393c6f
commit 5fe3ac86ee1702d957621c2054507eed2c393c6f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 18 07:54:56 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 18 07:54:56 2010 -0500

    Prefer non-empty prefixes when matching lib names (#11468)
    
    In cmComputeLinkInformation we match library names with a regular
    expression, possibly extracting the 'lib' prefix.  The regex component
    to match the prefix always allows an empty prefix to be matched, as in
    "(lib|)".  Avoid every adding an empty prefix option earlier in the
    regex, as in "(|lib|)", because it will be preferred and 'lib' will
    never match.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 1cabed2..d53200c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -923,7 +923,7 @@ void cmComputeLinkInformation::ComputeItemParserInfo()
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddLinkPrefix(const char* p)
 {
-  if(p)
+  if(p && *p)
     {
     this->LinkPrefixes.insert(p);
     }

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

Summary of changes:
 Source/cmComputeLinkInformation.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake