[Cmake-commits] CMake branch, next, updated. v3.2.3-1428-g4b6cbb7

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4b6cbb7dfb21f2cb684796a9711d8c8edf312c19 (commit)
       via  39fc3ed7e0db554818f41c3623bd858e0399dbb0 (commit)
       via  54a95f5fc66574cd9fff07024cc449b160b5629a (commit)
      from  9e7ae5f1be633f3241f635df0a9dcc3465c21348 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b6cbb7dfb21f2cb684796a9711d8c8edf312c19
commit 4b6cbb7dfb21f2cb684796a9711d8c8edf312c19
Merge: 9e7ae5f 39fc3ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 09:29:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 3 09:29:37 2015 -0400

    Merge topic 'CPackDeb-dpkg-shlibdeps-check-flag' into next
    
    39fc3ed7 CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flag
    54a95f5f CPackDeb: Check dpkg-shlibdeps version more robustly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39fc3ed7e0db554818f41c3623bd858e0399dbb0
commit 39fc3ed7e0db554818f41c3623bd858e0399dbb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 09:23:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 3 09:23:02 2015 -0400

    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.

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()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54a95f5fc66574cd9fff07024cc449b160b5629a
commit 54a95f5fc66574cd9fff07024cc449b160b5629a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 09:21:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 3 09:22:27 2015 -0400

    CPackDeb: Check dpkg-shlibdeps version more robustly
    
    Use if(MATCHES) to verify that a match exists before using the match
    group variable.

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 226153c..48f6dd1 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -352,10 +352,11 @@ function(cpack_deb_prepare_package_vars)
         OUTPUT_VARIABLE _TMP_VERSION
         ERROR_QUIET
         OUTPUT_STRIP_TRAILING_WHITESPACE)
-      string(REGEX MATCH "dpkg-shlibdeps version ([0-9]+\\.[0-9]+\\.[0-9]+)"
-        SHLIBDEPS_EXECUTABLE_VERSION
-        "${_TMP_VERSION}")
-      set(SHLIBDEPS_EXECUTABLE_VERSION "${CMAKE_MATCH_1}")
+      if(_TMP_VERSION MATCHES "dpkg-shlibdeps version ([0-9]+\\.[0-9]+\\.[0-9]+)")
+        set(SHLIBDEPS_EXECUTABLE_VERSION "${CMAKE_MATCH_1}")
+      else()
+        set(SHLIBDEPS_EXECUTABLE_VERSION "")
+      endif()
 
       if(CPACK_DEBIAN_PACKAGE_DEBUG)
         message("CPackDeb Debug: dpkg-shlibdeps --version output is '${_TMP_VERSION}'")

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackDeb.cmake |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake