kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPackDeb: Check dpkg-shlibdeps version more robustly 

Use if(MATCHES) to verify that a match exists before using the match
group variable.
This commit is contained in:
Brad King 2015-06-03 09:21:52 -04:00
parent a6916a6c6e
commit 54a95f5fc6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/CPackDeb.cmake
View File

@ -352,10 +352,11 @@ function(cpack_deb_prepare_package_vars)
OUTPUT_VARIABLE _TMP_VERSION OUTPUT_VARIABLE _TMP_VERSION
ERROR_QUIET ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX MATCH "dpkg-shlibdeps version ([0-9]+\\.[0-9]+\\.[0-9]+)" if(_TMP_VERSION MATCHES "dpkg-shlibdeps version ([0-9]+\\.[0-9]+\\.[0-9]+)")
SHLIBDEPS_EXECUTABLE_VERSION set(SHLIBDEPS_EXECUTABLE_VERSION "${CMAKE_MATCH_1}")
"${_TMP_VERSION}") else()
set(SHLIBDEPS_EXECUTABLE_VERSION "${CMAKE_MATCH_1}") set(SHLIBDEPS_EXECUTABLE_VERSION "")
endif()
if(CPACK_DEBIAN_PACKAGE_DEBUG) if(CPACK_DEBIAN_PACKAGE_DEBUG)
message("CPackDeb Debug: dpkg-shlibdeps --version output is '${_TMP_VERSION}'") message("CPackDeb Debug: dpkg-shlibdeps --version output is '${_TMP_VERSION}'")