[Cmake-commits] CMake branch, next, updated. v2.8.7-2852-gc1870a2

[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  c1870a21f6f955311580ff37542dd625f5d3171e (commit)
       via  19ab581973a0821beeeb33ce2e9ef34d1120a11f (commit)
      from  1427ddc20da9c47a85a639e004581fe85ccd183d (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=c1870a21f6f955311580ff37542dd625f5d3171e
commit c1870a21f6f955311580ff37542dd625f5d3171e
Merge: 1427ddc 19ab581
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 24 10:36:31 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 24 10:36:31 2012 -0500

    Merge topic 'fix-FindPackageMode-symlink' into next
    
    19ab581 CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ab581973a0821beeeb33ce2e9ef34d1120a11f
commit 19ab581973a0821beeeb33ce2e9ef34d1120a11f
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Fri Feb 24 01:39:39 2012 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 24 10:33:46 2012 -0500

    CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink

diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index 4296577..bcf3014 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -71,7 +71,8 @@ if(UNIX)
       # use the file utility to check whether itself is 64 bit:
       find_program(FILE_EXECUTABLE file)
       if(FILE_EXECUTABLE)
-        execute_process(COMMAND "${FILE_EXECUTABLE}" "${FILE_EXECUTABLE}" OUTPUT_VARIABLE fileOutput ERROR_QUIET)
+        get_filename_component(FILE_ABSPATH "${FILE_EXECUTABLE}" ABSOLUTE CACHE)
+        execute_process(COMMAND "${FILE_ABSPATH}" "${FILE_ABSPATH}" OUTPUT_VARIABLE fileOutput ERROR_QUIET)
         if("${fileOutput}" MATCHES "64-bit")
           set(CMAKE_SIZEOF_VOID_P 8)
         endif()

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

Summary of changes:
 Modules/CMakeFindPackageMode.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake