[Cmake-commits] CMake branch, next, updated. v3.6.1-1764-g083f180
Domen Vrankar
domen.vrankar at gmail.com
Sun Sep 4 17:10:07 EDT 2016
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 083f1806004094f87741ba58655d7536dc05aa1d (commit)
via 0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23 (commit)
from ed02aa4047c6e5aff30d1cb20ab29678399379c4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=083f1806004094f87741ba58655d7536dc05aa1d
commit 083f1806004094f87741ba58655d7536dc05aa1d
Merge: ed02aa4 0d7c971
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Sep 4 17:10:07 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 4 17:10:07 2016 -0400
Merge topic 'cpack-deb-long-filenames' into next
0d7c9712 fixup! cpack-deb-long-filenames
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
commit 0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Sep 4 23:09:53 2016 +0200
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Sep 4 23:09:53 2016 +0200
fixup! cpack-deb-long-filenames
diff --git a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
index 169be1c..0452343 100644
--- a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
@@ -6,6 +6,9 @@ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/info")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/available" "")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/status" "")
+# some programs used by fakeroot require sbin in path so we should not
+# leave this to chance (programs: ldconfig and start-stop-daemon)
+set(ENV{PATH} "$ENV{PATH}:/usr/local/sbin:/usr/sbin:/sbin")
execute_process(COMMAND ${FAKEROOT_EXECUTABLE} ${DPKG_EXECUTABLE}
-i --force-not-root --root=${CMAKE_CURRENT_BINARY_DIR}/root_dir
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list