diff options
author | Brad King <brad.king@kitware.com> | 2019-06-17 12:05:29 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-17 12:05:53 (GMT) |
commit | 24916ce81e1bd172a5d17450cab24282e6364819 (patch) | |
tree | 167bee32f0bf39157f88ada3a8917462ee28e017 /Modules | |
parent | ab63072381171e9c5a7164536f0912b8b3a4a313 (diff) | |
parent | 3092c27f30b52e737a499a3eb91b2a160e9f3863 (diff) | |
download | CMake-24916ce81e1bd172a5d17450cab24282e6364819.zip CMake-24916ce81e1bd172a5d17450cab24282e6364819.tar.gz CMake-24916ce81e1bd172a5d17450cab24282e6364819.tar.bz2 |
Merge topic 'cpack-deb-soname'
3092c27f30 CPack: Fix SONAME regex in DEB generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3440
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Internal/CPack/CPackDeb.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 89dc6f0..7791822 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -45,7 +45,7 @@ function(extract_so_info shared_object libname version) ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if(result EQUAL 0) - string(REGEX MATCH "\\(SONAME\\)[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]" soname "${output}") + string(REGEX MATCH "\\(?SONAME\\)?[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]" soname "${output}") set(${libname} "${CMAKE_MATCH_1}" PARENT_SCOPE) set(${version} "${CMAKE_MATCH_2}" PARENT_SCOPE) else() |