[Cmake-commits] CMake branch, next, updated. v3.7.1-1640-g4bba79a

[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  4bba79ad0ceb753c87c268eb1b66dc3d818223f0 (commit)
       via  e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9 (commit)
      from  09219634e58399eef76e06afd2a74caeb93cf905 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bba79ad0ceb753c87c268eb1b66dc3d818223f0
commit 4bba79ad0ceb753c87c268eb1b66dc3d818223f0
Merge: 0921963 e326d8c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Dec 7 18:13:21 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 7 18:13:21 2016 -0500

    Merge topic 'cpack-deb-missing-file-utility-error' into next
    
    e326d8cf CPack/DEB shlibdep options depend on file utility


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9
commit e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9
Author:     Henning Meyer <henning.meyer at dedrone.com>
AuthorDate: Wed Dec 7 20:45:45 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Dec 7 22:25:06 2016 +0100

    CPack/DEB shlibdep options depend on file utility
    
    Missing or missconfigured file utility should not
    skip adding dependencies. Instead it should print
    out a fatal error message.
    
    Fixes #16486

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 909a12b..bee69d9 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -587,12 +587,21 @@ function(cpack_deb_prepare_package_vars)
       file(GLOB_RECURSE FILE_PATHS_ LIST_DIRECTORIES false RELATIVE "${WDIR}" "${WDIR}/*")
     cmake_policy(POP)
 
+    find_program(FILE_EXECUTABLE file)
+    if(NOT FILE_EXECUTABLE)
+      message(FATAL_ERROR "CPackDeb: file utility is not available. CPACK_DEBIAN_PACKAGE_SHLIBDEPS and CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS options are not available.")
+    endif()
+
     # 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_}"
+      execute_process(COMMAND env LC_ALL=C ${FILE_EXECUTABLE} "./${FILE_}"
         WORKING_DIRECTORY "${WDIR}"
+        RESULT_VARIABLE FILE_RESULT_
         OUTPUT_VARIABLE INSTALL_FILE_)
+      if(NOT FILE_RESULT_ EQUAL 0)
+        message (FATAL_ERROR "CPackDeb: execution of command: '${FILE_EXECUTABLE} ./${FILE_}' failed with exit code: ${FILE_RESULT_}")
+      endif()
       list(APPEND CPACK_DEB_INSTALL_FILES "${INSTALL_FILE_}")
     endforeach()
 

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

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


hooks/post-receive
-- 
CMake