diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-21 21:29:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-21 21:29:16 (GMT) |
| commit | 682a989fdb60b9ed6af9275fb87757df0503a31b (patch) | |
| tree | ae27acdcc336fdea12b2dbb368dd43c7e5fab81a | |
| parent | 41c6b3dd4db6f75cfc1ca2be3c28890c0506b6b5 (diff) | |
| parent | 49da3bdb2de4266955330f092b369a7afba0ca9d (diff) | |
| download | CMake-682a989fdb60b9ed6af9275fb87757df0503a31b.zip CMake-682a989fdb60b9ed6af9275fb87757df0503a31b.tar.gz CMake-682a989fdb60b9ed6af9275fb87757df0503a31b.tar.bz2 | |
Merge topic 'CPackDeb-fakeroot'
49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
| -rw-r--r-- | Modules/CPackDeb.cmake | 5 | ||||
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 0975c5b..26433bb 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 "; |