diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-03 13:23:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-03 13:23:02 (GMT) |
| commit | 39fc3ed7e0db554818f41c3623bd858e0399dbb0 (patch) | |
| tree | 540a42c2c3738d31012c13ec90029291d8f1b7fa | |
| parent | 54a95f5fc66574cd9fff07024cc449b160b5629a (diff) | |
| download | CMake-39fc3ed7e0db554818f41c3623bd858e0399dbb0.zip CMake-39fc3ed7e0db554818f41c3623bd858e0399dbb0.tar.gz CMake-39fc3ed7e0db554818f41c3623bd858e0399dbb0.tar.bz2 | |
CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flag
Check for this flag explicitly in the --help output before using it. It
turns out there are some versions of the tool that support --version but
not --ignore-missing-info.
| -rw-r--r-- | Modules/CPackDeb.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 48f6dd1..09cddcd 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -399,9 +399,12 @@ function(cpack_deb_prepare_package_vars) file(MAKE_DIRECTORY ${CPACK_TEMPORARY_DIRECTORY}/debian) file(WRITE ${CPACK_TEMPORARY_DIRECTORY}/debian/control "") - # only set ignore-missing-info flag for dpkg-shlibdeps that have --version option - # (those are newer and also have --ignore-missing-info flag) - if(SHLIBDEPS_EXECUTABLE_VERSION) + # Add --ignore-missing-info if the tool supports it + execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --help + OUTPUT_VARIABLE _TMP_HELP + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(_TMP_HELP MATCHES "--ignore-missing-info") set(IGNORE_MISSING_INFO_FLAG "--ignore-missing-info") endif() |