diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-23 14:35:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-23 14:36:09 (GMT) |
| commit | 9c52b587b6dfa54266bcebbe7e111d7dde437a75 (patch) | |
| tree | f69a6e218215177afb0dabf2a1f46d2f27d9d952 | |
| parent | ce863c17d08e6631c4a194fc3f9fb3f63ea65d11 (diff) | |
| parent | 5cbf3653ff25a42577e9473b447a4b9afb128875 (diff) | |
| download | CMake-9c52b587b6dfa54266bcebbe7e111d7dde437a75.zip CMake-9c52b587b6dfa54266bcebbe7e111d7dde437a75.tar.gz CMake-9c52b587b6dfa54266bcebbe7e111d7dde437a75.tar.bz2 | |
Merge topic 'recognize-versioned-shared-libraries'
5cbf3653 cmComputeLinkInformation: Better RPATH detection for versioned libraries.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1682
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index fb13a58..18cca5a 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -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 += "$"; |