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 46bb516ee75ef7d87641da2703a7add564dd56e0 (commit) via 49da3bdb2de4266955330f092b369a7afba0ca9d (commit) from 3bc31e6774e4cd8728be8de5d591297f4b36d7a7 (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=46bb516ee75ef7d87641da2703a7add564dd56e0 commit 46bb516ee75ef7d87641da2703a7add564dd56e0 Merge: 3bc31e6 49da3bd Author: Eric Noulard <eric.noul...@gmail.com> AuthorDate: Tue Sep 20 14:01:43 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Sep 20 14:01:43 2011 -0400 Merge topic 'CPackDeb-fakeroot' into next 49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49da3bdb2de4266955330f092b369a7afba0ca9d commit 49da3bdb2de4266955330f092b369a7afba0ca9d Author: Eric NOULARD <eric.noul...@gmail.com> AuthorDate: Mon Sep 5 22:43:45 2011 +0200 Commit: Eric NOULARD <eric.noul...@gmail.com> CommitDate: Mon Sep 5 22:43:45 2011 +0200 CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 90c80a4..d1c0bbe 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -133,6 +133,11 @@ IF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS) SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF) ENDIF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS) +FIND_PROGRAM(FAKEROOT_EXECUTABLE fakeroot) +IF(FAKEROOT_EXECUTABLE) + SET(CPACK_DEBIAN_FAKEROOT_EXECUTABLE ${FAKEROOT_EXECUTABLE}) +ENDIF(FAKEROOT_EXECUTABLE) + IF(CPACK_DEBIAN_PACKAGE_SHLIBDEPS) # dpkg-shlibdeps is a Debian utility for generating dependency list FIND_PROGRAM(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps) diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 8c19bbd..b707e96 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -392,7 +392,10 @@ int cmCPackDebGenerator::createDeb() } std::string cmd; - cmd = "\""; + if (NULL != this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE")) { + cmd += this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE"); + } + cmd += " \""; cmd += cmakeExecutable; cmd += "\" -E tar cfz data.tar.gz "; ----------------------------------------------------------------------- Summary of changes: Modules/CPackDeb.cmake | 5 +++++ Source/CPack/cmCPackDebGenerator.cxx | 5 ++++- 2 files changed, 9 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits