[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5144-g5bfd2c6

[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  5bfd2c61155ac8d5e90b7aea58c7adc823bfb49a (commit)
       via  2e3809314d09372a552c2d6e7b8e656960675957 (commit)
      from  4e418e67b774f97edbe1486d7d40e1fabdcf66bd (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=5bfd2c61155ac8d5e90b7aea58c7adc823bfb49a
commit 5bfd2c61155ac8d5e90b7aea58c7adc823bfb49a
Merge: 4e418e6 2e38093
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 14 04:10:02 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 14 04:10:02 2013 -0500

    Merge topic 'find-libs-numeric-suffix' into next
    
    2e38093 find_library: Find shared libraries with numerical suffixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e3809314d09372a552c2d6e7b8e656960675957
commit 2e3809314d09372a552c2d6e7b8e656960675957
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 30 16:01:21 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 14 10:09:23 2013 +0100

    find_library: Find shared libraries with numerical suffixes
    
    Commit 342fc040 (Recognize shared library files with a numerical
    suffix, 2013-04-11) taught cmComputeLinkInformation to handle
    shared libraries with numerical suffixes. Before this commit,
    find_library ignored such shared libraries. This is a problem
    for finding libGL.so.1 on a raspberryPi. Apparently there
    is no libGL.so without a numeric suffix, so the GL library can
    not be found.

diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index de52df7..3684faf 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -175,9 +175,6 @@ struct cmFindLibraryHelper
   typedef std::vector<std::string>::size_type size_type;
   std::string BestPath;
 
-  // Support for OpenBSD shared library naming: lib<name>.so.<major>.<minor>
-  bool OpenBSD;
-
   // Current names under consideration.
   struct Name
   {
@@ -224,11 +221,6 @@ cmFindLibraryHelper::cmFindLibraryHelper(cmMakefile* mf):
   cmSystemTools::ExpandListArgument(suffixes_list, this->Suffixes, true);
   this->RegexFromList(this->PrefixRegexStr, this->Prefixes);
   this->RegexFromList(this->SuffixRegexStr, this->Suffixes);
-
-  // Check whether to use OpenBSD-style library version comparisons.
-  this->OpenBSD =
-    this->Makefile->GetCMakeInstance()
-    ->GetPropertyAsBool("FIND_LIBRARY_USE_OPENBSD_VERSIONING");
 }
 
 //----------------------------------------------------------------------------
@@ -314,10 +306,7 @@ void cmFindLibraryHelper::AddName(std::string const& name)
   regex += this->PrefixRegexStr;
   this->RegexFromLiteral(regex, name);
   regex += this->SuffixRegexStr;
-  if(this->OpenBSD)
-    {
-    regex += "(\\.[0-9]+\\.[0-9]+)?";
-    }
+  regex += "(\\.[0-9]+\\.[0-9]+)?";
   regex += "$";
   entry.Regex.compile(regex.c_str());
   this->Names.push_back(entry);
@@ -386,16 +375,15 @@ bool cmFindLibraryHelper::CheckDirectoryForName(std::string const& path,
         {
         // This is a matching file.  Check if it is better than the
         // best name found so far.  Earlier prefixes are preferred,
-        // followed by earlier suffixes.  For OpenBSD, shared library
-        // version extensions are compared.
+        // followed by earlier suffixes.  Shared library version extensions
+        // are also compared.
         size_type prefix = this->GetPrefixIndex(name.Regex.match(1));
         size_type suffix = this->GetSuffixIndex(name.Regex.match(2));
         unsigned int major = 0;
         unsigned int minor = 0;
-        if(this->OpenBSD)
-          {
-          sscanf(name.Regex.match(3).c_str(), ".%u.%u", &major, &minor);
-          }
+
+        sscanf(name.Regex.match(3).c_str(), ".%u.%u", &major, &minor);
+
         if(this->BestPath.empty() || prefix < bestPrefix ||
            (prefix == bestPrefix && suffix < bestSuffix) ||
            (prefix == bestPrefix && suffix == bestSuffix &&

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

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


hooks/post-receive
-- 
CMake