[Cmake-commits] CMake branch, next, updated. v2.8.8-3369-g2131259
Clinton Stimpson
clinton at elemtech.com
Thu Jul 5 14:49:08 EDT 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 2131259bf00f7ed3575ff0cf3d862dc2a731096a (commit)
via ac7a1939511eda6b2baa1211fa5dcd12ec241fae (commit)
from 260a24a1eab038a0fff97961ec931c2fb5d3b0bf (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=2131259bf00f7ed3575ff0cf3d862dc2a731096a
commit 2131259bf00f7ed3575ff0cf3d862dc2a731096a
Merge: 260a24a ac7a193
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 5 14:49:04 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 5 14:49:04 2012 -0400
Merge topic 'getprerequisites-pie-executables' into next
ac7a193 GetPrerequisites.cmake: detect executables built with the -pie linker flag.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac7a1939511eda6b2baa1211fa5dcd12ec241fae
commit ac7a1939511eda6b2baa1211fa5dcd12ec241fae
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 5 12:49:40 2012 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jul 5 12:49:40 2012 -0600
GetPrerequisites.cmake: detect executables built with the -pie linker flag.
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 8761f40..d215685 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -195,6 +195,14 @@ function(is_file_executable file result_var)
return()
endif("${file_ov}" MATCHES "text")
endif("${file_ov}" MATCHES "executable")
+
+ # Also detect position independent executables on Linux,
+ # where "file" gives "shared object ... (uses shared libraries)"
+ if("${file_ov}" MATCHES "shared object.*\(uses shared libs\)")
+ set(${result_var} 1 PARENT_SCOPE)
+ return()
+ endif()
+
else(file_cmd)
message(STATUS "warning: No 'file' command, skipping execute_process...")
endif(file_cmd)
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list