[Cmake-commits] CMake branch, next, updated. v3.2.2-2500-ga4a12f9

[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  a4a12f9c4675d2e9145d0311331c06097b4c824b (commit)
       via  0bed81bf54997edd23a06b26da55657fe5d4e612 (commit)
       via  9ae1c52d935111a7f3ff3acf6ab82fed87ed24b0 (commit)
      from  dcd76bd58f7876804bd15d96275f9874257e8277 (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=a4a12f9c4675d2e9145d0311331c06097b4c824b
commit a4a12f9c4675d2e9145d0311331c06097b4c824b
Merge: dcd76bd 0bed81b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon May 4 17:49:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 4 17:49:11 2015 -0400

    Merge topic 'cpack-deb-component-auto-discovery' into next
    
    0bed81bf fixup! CPack/DEB component dependency auto-discovery
    9ae1c52d fixup! CPack/DEB component dependency auto-discovery


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bed81bf54997edd23a06b26da55657fe5d4e612
commit 0bed81bf54997edd23a06b26da55657fe5d4e612
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon May 4 23:34:35 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon May 4 23:48:18 2015 +0200

    fixup! CPack/DEB component dependency auto-discovery
    
    find command on Mac OS doesn't accept same flags as
    on Linux so we should use cmake file(GLOB_RECURSE)
    instead

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 7fce49b..ad3aa0f 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -252,6 +252,8 @@ function(cpack_deb_prepare_package_vars)
     set(CPACK_DEBIAN_FAKEROOT_EXECUTABLE ${FAKEROOT_EXECUTABLE})
   endif()
 
+  set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_PATH}")
+
   # per component automatic discover: some of the component might not have
   # binaries.
   if(CPACK_DEB_PACKAGE_COMPONENT)
@@ -288,13 +290,21 @@ function(cpack_deb_prepare_package_vars)
       endif()
 
       # Generating binary list - Get type of all install files
-      execute_process(COMMAND find -type f
-        COMMAND xargs file
-        WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
-        OUTPUT_VARIABLE CPACK_DEB_INSTALL_FILES)
-
-      # Convert to CMake list
-      string(REPLACE "\n" ";" CPACK_DEB_INSTALL_FILES "${CPACK_DEB_INSTALL_FILES}")
+      cmake_policy(PUSH)
+        # Tell file(GLOB_RECURSE) not to follow directory symlinks
+        # even if the project does not set this policy to NEW.
+        cmake_policy(SET CMP0009 NEW)
+        file(GLOB_RECURSE FILE_PATHS_ LIST_DIRECTORIES false RELATIVE "${WDIR}" "${WDIR}/*")
+      cmake_policy(POP)
+
+      # get file info so that we can determine if file is executable or not
+      unset(CPACK_DEB_INSTALL_FILES)
+      foreach(FILE_ IN LISTS FILE_PATHS_)
+        execute_process(COMMAND file "./${FILE_}"
+          WORKING_DIRECTORY "${WDIR}"
+          OUTPUT_VARIABLE INSTALL_FILE_)
+        list(APPEND CPACK_DEB_INSTALL_FILES "${INSTALL_FILE_}")
+      endforeach()
 
       # Only dynamically linked ELF files are included
       # Extract only file name infront of ":"
@@ -333,7 +343,7 @@ 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}")
+        message (FATAL_ERROR "CPackDeb: dpkg-shlibdeps: '${SHLIBDEPS_ERROR}'; executed command: '${SHLIBDEPS_EXECUTABLE} ${IGNORE_MISSING_INFO_FLAG} -O ${CPACK_DEB_BINARY_FILES}'")
       endif()
 
       #Get rid of prefix generated by dpkg-shlibdeps
@@ -482,8 +492,6 @@ function(cpack_deb_prepare_package_vars)
     set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME "")
   endif()
 
-  set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_PATH}")
-
   # Print out some debug information if we were asked for that
   if(CPACK_DEBIAN_PACKAGE_DEBUG)
      message("CPackDeb:Debug: CPACK_TOPLEVEL_DIRECTORY          = ${CPACK_TOPLEVEL_DIRECTORY}")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ae1c52d935111a7f3ff3acf6ab82fed87ed24b0
commit 9ae1c52d935111a7f3ff3acf6ab82fed87ed24b0
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon May 4 23:31:29 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon May 4 23:48:18 2015 +0200

    fixup! CPack/DEB component dependency auto-discovery
    
    Test did not execute dpkg-deb test section even if
    executable existed

diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-shlibdeps1.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-shlibdeps1.cmake
index 4aff0eb..79d8f0d 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-shlibdeps1.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-shlibdeps1.cmake
@@ -37,6 +37,7 @@ endif()
 
 
 # dpkg-deb checks for the summary of the packages
+find_program(DPKGDEB_EXECUTABLE dpkg-deb)
 if(DPKGDEB_EXECUTABLE)
   set(dpkgdeb_output_errors_all)
   foreach(_f IN LISTS actual_output)

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

Summary of changes:
 Modules/CPackDeb.cmake                             |   28 +++++++++++++-------
 ...unCPackVerifyResult-components-shlibdeps1.cmake |    1 +
 2 files changed, 19 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake