[Cmake-commits] CMake branch, next, updated. v2.8.7-2582-g3c2a66f

[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  3c2a66f295f8b18131c115984be3ca6af8077726 (commit)
       via  afc75bb7f520b7405a08f24a25a42542d3e3c92f (commit)
      from  cf960046396993632d9b7c153af099984f801844 (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=3c2a66f295f8b18131c115984be3ca6af8077726
commit 3c2a66f295f8b18131c115984be3ca6af8077726
Merge: cf96004 afc75bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 14 10:09:49 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 14 10:09:49 2012 -0500

    Merge topic 'link-OpenBSD-shared-libs-issue-12954' into next
    
    afc75bb Recognize OpenBSD versioned .so names (#12954)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afc75bb7f520b7405a08f24a25a42542d3e3c92f
commit afc75bb7f520b7405a08f24a25a42542d3e3c92f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 13 10:33:27 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 13 10:34:41 2012 -0500

    Recognize OpenBSD versioned .so names (#12954)
    
    OpenBSD shared library names end in a ".#.#" version number suffix.
    Teach cmComputeLinkInformation to tolerate the extra suffix after
    the normal library name suffixes when parsing library names.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index edf6c35..57fd5b4 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -248,6 +248,10 @@ cmComputeLinkInformation
   this->GlobalGenerator = this->LocalGenerator->GetGlobalGenerator();
   this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance();
 
+  // Check whether to recognize OpenBSD-style library versioned names.
+  this->OpenBSD = this->Makefile->GetCMakeInstance()
+    ->GetPropertyAsBool("FIND_LIBRARY_USE_OPENBSD_VERSIONING");
+
   // The configuration being linked.
   this->Config = config;
 
@@ -973,7 +977,15 @@ cmComputeLinkInformation
     }
 
   // Finish the list.
-  libext += ")$";
+  libext += ")";
+
+  // Add an optional OpenBSD version component.
+  if(this->OpenBSD)
+    {
+    libext += "(\\.[0-9]+\\.[0-9]+)?";
+    }
+
+  libext += "$";
   return libext;
 }
 
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index bbeed68..f60f8d3 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -128,6 +128,7 @@ private:
   cmsys::RegularExpression ExtractSharedLibraryName;
   cmsys::RegularExpression ExtractAnyLibraryName;
   std::string SharedRegexString;
+  bool OpenBSD;
   void AddLinkPrefix(const char* p);
   void AddLinkExtension(const char* e, LinkType type);
   std::string CreateExtensionRegex(std::vector<std::string> const& exts);

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

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


hooks/post-receive
-- 
CMake