[Cmake-commits] CMake branch, next, updated. v2.8.7-2935-g23b713a
Brad King
brad.king at kitware.com
Tue Feb 28 12:58:52 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 23b713a4d6ac87e3b4f0f6ce1a2bd69fbc9ccab6 (commit)
via e7967a71a52eea4d384be74dc55f62ede3707df2 (commit)
from 96f869886bd1ceb181860548939a4e8c738b06eb (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=23b713a4d6ac87e3b4f0f6ce1a2bd69fbc9ccab6
commit 23b713a4d6ac87e3b4f0f6ce1a2bd69fbc9ccab6
Merge: 96f8698 e7967a7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 28 12:58:46 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 28 12:58:46 2012 -0500
Merge topic 'fix-FindPackageMode-symlink' into next
e7967a7 CMakeFindPackageMode: do not cache absolute path conversion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7967a71a52eea4d384be74dc55f62ede3707df2
commit e7967a71a52eea4d384be74dc55f62ede3707df2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 28 12:58:05 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 28 12:58:05 2012 -0500
CMakeFindPackageMode: do not cache absolute path conversion
diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index bcf3014..59c7ba5 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -71,7 +71,7 @@ if(UNIX)
# use the file utility to check whether itself is 64 bit:
find_program(FILE_EXECUTABLE file)
if(FILE_EXECUTABLE)
- get_filename_component(FILE_ABSPATH "${FILE_EXECUTABLE}" ABSOLUTE CACHE)
+ 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:
Modules/CMakeFindPackageMode.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list