[Cmake-commits] CMake branch, next, updated. v3.2.2-2585-gffd4c58

[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  ffd4c588ef0e205f665f19e1bc9ad241cc757061 (commit)
       via  d498c8b1b6c98c72208d60f91bfc321e455b0f84 (commit)
      from  583be259f60d03db0b74905e4905f93db1bf7cc4 (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=ffd4c588ef0e205f665f19e1bc9ad241cc757061
commit ffd4c588ef0e205f665f19e1bc9ad241cc757061
Merge: 583be25 d498c8b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed May 6 17:15:55 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 6 17:15:55 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d498c8b1b6c98c72208d60f91bfc321e455b0f84
commit d498c8b1b6c98c72208d60f91bfc321e455b0f84
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed May 6 23:15:39 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed May 6 23:15:39 2015 +0200

    fixup! CPack/DEB component dependency auto-discovery
    
    Cosmetic changes

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index ac0fbe1..d1d5d09 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -331,26 +331,26 @@ function(cpack_deb_prepare_package_vars)
           set(IGNORE_MISSING_INFO_FLAG "--ignore-missing-info")
         endif()
 
-      # Execute dpkg-shlibdeps
-      # --ignore-missing-info : allow dpkg-shlibdeps to run even if some libs do not belong to a package
-      # -O : print to STDOUT
-      execute_process(COMMAND ${SHLIBDEPS_EXECUTABLE} ${IGNORE_MISSING_INFO_FLAG} -O ${CPACK_DEB_BINARY_FILES}
-        WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
-        OUTPUT_VARIABLE SHLIBDEPS_OUTPUT
-        RESULT_VARIABLE SHLIBDEPS_RESULT
-        ERROR_VARIABLE SHLIBDEPS_ERROR
-        OUTPUT_STRIP_TRAILING_WHITESPACE )
-      if(CPACK_DEBIAN_PACKAGE_DEBUG)
-        # dpkg-shlibdeps will throw some warnings if some input files are not binary
-        message( "CPackDeb Debug: dpkg-shlibdeps warnings \n${SHLIBDEPS_ERROR}")
-      endif()
-      if(NOT SHLIBDEPS_RESULT EQUAL 0)
-        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()
+        # Execute dpkg-shlibdeps
+        # --ignore-missing-info : allow dpkg-shlibdeps to run even if some libs do not belong to a package
+        # -O : print to STDOUT
+        execute_process(COMMAND ${SHLIBDEPS_EXECUTABLE} ${IGNORE_MISSING_INFO_FLAG} -O ${CPACK_DEB_BINARY_FILES}
+          WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
+          OUTPUT_VARIABLE SHLIBDEPS_OUTPUT
+          RESULT_VARIABLE SHLIBDEPS_RESULT
+          ERROR_VARIABLE SHLIBDEPS_ERROR
+          OUTPUT_STRIP_TRAILING_WHITESPACE )
+        if(CPACK_DEBIAN_PACKAGE_DEBUG)
+          # dpkg-shlibdeps will throw some warnings if some input files are not binary
+          message( "CPackDeb Debug: dpkg-shlibdeps warnings \n${SHLIBDEPS_ERROR}")
+        endif()
+        if(NOT SHLIBDEPS_RESULT EQUAL 0)
+          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
         string(REGEX REPLACE "^.*Depends=" "" CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS "${SHLIBDEPS_OUTPUT}")
@@ -371,7 +371,7 @@ function(cpack_deb_prepare_package_vars)
         endif()
       else()
         if(CPACK_DEBIAN_PACKAGE_DEBUG)
-          message( "CPackDeb Debug: Using only user-provided depends because package does not contain executable files.")
+          message( "CPackDeb Debug: Using only user-provided depends because package does not contain executable files that contain dynamically linked libraries.")
         endif()
       endif()
     else()

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

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


hooks/post-receive
-- 
CMake