[Cmake-commits] CMake branch, next, updated. v2.8.7-2937-gd2d0ad7

Brad King brad.king at kitware.com
Tue Feb 28 12:59:15 EST 2012

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  d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871 (commit)
       via  0b8638821eccd09a50dfb26cfe7a82549c8254c5 (commit)
      from  23b713a4d6ac87e3b4f0f6ce1a2bd69fbc9ccab6 (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 -----------------------------------------------------------------
commit d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871
Merge: 23b713a 0b86388
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 28 12:59:14 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 28 12:59:14 2012 -0500

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

commit 0b8638821eccd09a50dfb26cfe7a82549c8254c5
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: Tue Feb 28 12:59:01 2012 -0500

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

diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index 4296577..59c7ba5 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)
+        get_filename_component(FILE_ABSPATH "${FILE_EXECUTABLE}" ABSOLUTE)
+        execute_process(COMMAND "${FILE_ABSPATH}" "${FILE_ABSPATH}" OUTPUT_VARIABLE fileOutput ERROR_QUIET)
         if("${fileOutput}" MATCHES "64-bit")
           set(CMAKE_SIZEOF_VOID_P 8)


Summary of changes:


More information about the Cmake-commits mailing list