[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-639-gc8fcbc9

[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  c8fcbc95076aa8f0a9a0f216506dcf400c60ec89 (commit)
       via  fe558718b30da989db8b880374012a0e580574e6 (commit)
      from  3f9d98434b29ad77aa6374410b8d3c45ead477e0 (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=c8fcbc95076aa8f0a9a0f216506dcf400c60ec89
commit c8fcbc95076aa8f0a9a0f216506dcf400c60ec89
Merge: 3f9d984 fe55871
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:50:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:50:44 2015 -0500

    Merge topic 'GetPrerequisites-file-command-update' into next
    
    fe558718 GetPrerequisites: Update output matching for newer 'file' versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe558718b30da989db8b880374012a0e580574e6
commit fe558718b30da989db8b880374012a0e580574e6
Author:     Marcus Meissner <meissner at suse.de>
AuthorDate: Mon Feb 23 10:51:42 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:50:29 2015 -0500

    GetPrerequisites: Update output matching for newer 'file' versions
    
    Detect PIE binaries with newer 'file' (5.22).  It no longer prints
    "(uses shared libraries)" but does print "interpreter":
    
     # file 5.19
     $ file /usr/bin/su
     /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ...
    
     # file 5.22
     $ file /usr/bin/su
     /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 712a41c..9fb85fe 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -260,6 +260,13 @@ function(is_file_executable file result_var)
         return()
       endif()
 
+      # "file" version 5.22 does not print "(used shared libraries)"
+      # but uses "interpreter"
+      if("${file_ov}" MATCHES "shared object.*interpreter")
+        set(${result_var} 1 PARENT_SCOPE)
+        return()
+      endif()
+
     else()
       message(STATUS "warning: No 'file' command, skipping execute_process...")
     endif()

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake