[Cmake-commits] CMake branch, next, updated. v3.2.2-2502-g935bc37

[Domen Vrankar]

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  935bc37896af130b31b064df495171411a9d3f0a (commit)
       via  f94263a8301ac06e154996c849d3090e3c123b39 (commit)
      from  a4a12f9c4675d2e9145d0311331c06097b4c824b (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=935bc37896af130b31b064df495171411a9d3f0a
commit 935bc37896af130b31b064df495171411a9d3f0a
Merge: a4a12f9 f94263a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue May 5 01:41:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 5 01:41:26 2015 -0400

    Merge topic 'cpack-deb-component-auto-discovery' into next
    
    f94263a8 fixup! CPack/DEB component dependency auto-discovery


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f94263a8301ac06e154996c849d3090e3c123b39
commit f94263a8301ac06e154996c849d3090e3c123b39
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue May 5 07:40:22 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue May 5 07:40:22 2015 +0200

    fixup! CPack/DEB component dependency auto-discovery
    
    dpkg-shlibdeps errors should print out additional
    info about input parameters

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index ad3aa0f..609d2ec 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -308,7 +308,7 @@ function(cpack_deb_prepare_package_vars)
 
       # Only dynamically linked ELF files are included
       # Extract only file name infront of ":"
-      foreach( _FILE ${CPACK_DEB_INSTALL_FILES})
+      foreach(_FILE ${CPACK_DEB_INSTALL_FILES})
         if( ${_FILE} MATCHES "ELF.*dynamically linked")
            string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}")
            list(APPEND CPACK_DEB_BINARY_FILES "${CMAKE_MATCH_1}")
@@ -343,7 +343,11 @@ function(cpack_deb_prepare_package_vars)
         message( "CPackDeb Debug: dpkg-shlibdeps warnings \n${SHLIBDEPS_ERROR}")
       endif()
       if(NOT SHLIBDEPS_RESULT EQUAL 0)
-        message (FATAL_ERROR "CPackDeb: dpkg-shlibdeps: '${SHLIBDEPS_ERROR}'; executed command: '${SHLIBDEPS_EXECUTABLE} ${IGNORE_MISSING_INFO_FLAG} -O ${CPACK_DEB_BINARY_FILES}'")
+        message (FATAL_ERROR "CPackDeb: dpkg-shlibdeps: '${SHLIBDEPS_ERROR}';\n"
+            "executed command: '${SHLIBDEPS_EXECUTABLE} ${IGNORE_MISSING_INFO_FLAG} -O ${CPACK_DEB_BINARY_FILES}';\n"
+            "found files: '${INSTALL_FILE_}';\n"
+            "files info: '${CPACK_DEB_INSTALL_FILES}';\n"
+            "binary files: '${CPACK_DEB_BINARY_FILES}'")
       endif()
 
       #Get rid of prefix generated by dpkg-shlibdeps

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

Summary of changes:
 Modules/CPackDeb.cmake |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake