[Cmake-commits] CMake branch, next, updated. v3.2.1-1384-gf35eabe
Brad King
brad.king at kitware.com
Wed Apr 1 16:34:18 EDT 2015
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 f35eabe9e13b51c50d06dfa32924cddbdd863f28 (commit)
via a293dcb561e3961c1d55f2fc8ccaaf1b4f17204c (commit)
from 6f7cdfdde45d0c0c7a994c67d096e78f36aa8ce9 (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=f35eabe9e13b51c50d06dfa32924cddbdd863f28
commit f35eabe9e13b51c50d06dfa32924cddbdd863f28
Merge: 6f7cdfd a293dcb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 16:34:17 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 16:34:17 2015 -0400
Merge topic 'fix-test-CMakeELF-read-only-source' into next
a293dcb5 Tests: Fix CMake.ELF test with read-only source (#15489)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a293dcb561e3961c1d55f2fc8ccaaf1b4f17204c
commit a293dcb561e3961c1d55f2fc8ccaaf1b4f17204c
Author: Bill Newcomb <bnewcomb at nvidia.com>
AuthorDate: Wed Apr 1 13:13:35 2015 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 16:34:04 2015 -0400
Tests: Fix CMake.ELF test with read-only source (#15489)
When the cmake sources are all set to read-only (e.g. after importing
into perforce), the CMake.ELF test fails because the copy of the binary
is also read-only and cannot be modified. Fix this by copying the
binary without source permissions.
diff --git a/Tests/CMakeTests/ELFTest.cmake.in b/Tests/CMakeTests/ELFTest.cmake.in
index 0271abb..4635778 100644
--- a/Tests/CMakeTests/ELFTest.cmake.in
+++ b/Tests/CMakeTests/ELFTest.cmake.in
@@ -11,7 +11,7 @@ set(out "@CMAKE_CURRENT_BINARY_DIR@/ELF-Out")
file(REMOVE_RECURSE "${out}")
file(MAKE_DIRECTORY "${out}")
foreach(f ${names})
- file(COPY ${in}/${f} DESTINATION ${out})
+ file(COPY ${in}/${f} DESTINATION ${out} NO_SOURCE_PERMISSIONS)
list(APPEND files "${out}/${f}")
endforeach()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeTests/ELFTest.cmake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list