فهرست منبع

Merge topic 'recognize-versioned-shared-libraries'

5cbf3653 cmComputeLinkInformation: Better RPATH detection for versioned libraries.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1682
Brad King 7 سال پیش
والد
کامیت
9c52b587b6
1فایلهای تغییر یافته به همراه3 افزوده شده و 5 حذف شده
  1. 3 5
      Source/cmComputeLinkInformation.cxx

+ 3 - 5
Source/cmComputeLinkInformation.cxx

@@ -913,11 +913,9 @@ std::string cmComputeLinkInformation::CreateExtensionRegex(
   // Finish the list.
   // Finish the list.
   libext += ")";
   libext += ")";
 
 
-  // Add an optional OpenBSD version component.
-  if (this->OpenBSD) {
-    libext += "(\\.[0-9]+\\.[0-9]+)?";
-  } else if (type == LinkShared) {
-    libext += "(\\.[0-9]+)?";
+  // Add an optional OpenBSD-style version or major.minor.version component.
+  if (this->OpenBSD || type == LinkShared) {
+    libext += "(\\.[0-9]+)*";
   }
   }
 
 
   libext += "$";
   libext += "$";