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 f1bc40b9c387d18dacebfa82ba7dcb3855aeb1d1 (commit)
via 27779efc7e127d3315b9e1b72bd8bfb7b2614884 (commit)
from 3c2b71a0ba0b2fb0afae341c3eb0ebce54dc511f (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=f1bc40b9c387d18dacebfa82ba7dcb3855aeb1d1
commit f1bc40b9c387d18dacebfa82ba7dcb3855aeb1d1
Merge: 3c2b71a 27779ef
Author: Adam Strzelecki <o...@java.pl>
AuthorDate: Sat Oct 4 11:36:13 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Oct 4 11:36:13 2014 -0400
Merge topic 'fix-OSX-bundle-rpaths-and-Qt5' into next
27779efc BundleUtilities: Use more portable find ... -perm
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27779efc7e127d3315b9e1b72bd8bfb7b2614884
commit 27779efc7e127d3315b9e1b72bd8bfb7b2614884
Author: Adam Strzelecki <o...@java.pl>
AuthorDate: Sat Oct 4 17:25:07 2014 +0200
Commit: Adam Strzelecki <o...@java.pl>
CommitDate: Sat Oct 4 17:25:07 2014 +0200
BundleUtilities: Use more portable find ... -perm
Since find ... -perm +0111 is not clearly POSIX compliant and some Linux
versions refuse it, it is better to use longer but portable:
find ... -perm \( -perm -0100 -o -perm -0010 -o -perm -0001 \)
Also quote last parameter of string(REPLACE ...) in case it is empty.
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index e7589c7..eedab44 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -388,11 +388,12 @@ function(get_bundle_all_executables bundle exes_var)
# which can take long time for large bundles, and since anyway we expect
# executable to have execute flag set we can narrow the list much quicker.
if(find_cmd)
- execute_process(COMMAND "${find_cmd}" "${bundle}" -type f -perm +0111
+ execute_process(COMMAND "${find_cmd}" "${bundle}"
+ -type f \( -perm -0100 -o -perm -0010 -o -perm -0001 \)
OUTPUT_VARIABLE file_list
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- string(REPLACE "\n" ";" file_list ${file_list})
+ string(REPLACE "\n" ";" file_list "${file_list}")
else()
file(GLOB_RECURSE file_list "${bundle}/*")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/BundleUtilities.cmake | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
