mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'recognize-versioned-shared-libraries'

Browse Source 
5cbf3653 cmComputeLinkInformation: Better RPATH detection for versioned libraries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1682
This commit is contained in:
Brad King
2018-01-23 14:35:46 +00:00
committed by Kitware Robot
parent ce863c17d0 5cbf3653ff
commit 9c52b587b6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmComputeLinkInformation.cxx
View File

@@ -913,11 +913,9 @@ std::string cmComputeLinkInformation::CreateExtensionRegex(
// Finish the list.
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 += "$";