kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPackDeb-fakeroot' 

49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
This commit is contained in:
David Cole 2011-09-21 17:29:16 -04:00 committed by CMake Topic Stage
parent 41c6b3dd4d 49da3bdb2d
commit 682a989fdb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CPackDeb.cmake
View File

@ -133,6 +133,11 @@ IF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF) SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
ENDIF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS) 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) IF(CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
# dpkg-shlibdeps is a Debian utility for generating dependency list # dpkg-shlibdeps is a Debian utility for generating dependency list
FIND_PROGRAM(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps) FIND_PROGRAM(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps)

5
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -392,7 +392,10 @@ int cmCPackDebGenerator::createDeb()
} }
std::string cmd; std::string cmd;
cmd = "\""; if (NULL != this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE")) {
cmd += this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE");
}
cmd += " \"";
cmd += cmakeExecutable; cmd += cmakeExecutable;
cmd += "\" -E tar cfz data.tar.gz "; cmd += "\" -E tar cfz data.tar.gz ";