diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-25 18:02:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-25 18:02:46 (GMT) |
| commit | 21be162f9b33b0054e7dd7f5cb0ce93685ae08b3 (patch) | |
| tree | 3795d2b06e4afcb532793d7446a5b203dbf621b9 /Source | |
| parent | 82c579de45a20ccbdd6c016199799e6922361de7 (diff) | |
| parent | abc9b32375952ab0a6a67f513a7f8dc594b06049 (diff) | |
| download | CMake-21be162f9b33b0054e7dd7f5cb0ce93685ae08b3.zip CMake-21be162f9b33b0054e7dd7f5cb0ce93685ae08b3.tar.gz CMake-21be162f9b33b0054e7dd7f5cb0ce93685ae08b3.tar.bz2 | |
Merge topic 'CPackDeb-fixFakerootOnControl'
abc9b32 Use fakeroot for control.tar.gz as well
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 178a18d..fa456de 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -480,11 +480,16 @@ int cmCPackDebGenerator::createDeb() // Do not end the md5sum file with yet another (invalid) } - cmd = "\""; - cmd += cmakeExecutable; - cmd += "\" -E tar cfz control.tar.gz ./control ./md5sums"; - const char* controlExtra = - this->GetOption("CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA"); + cmd = ""; + if (NULL != this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE")) + { + cmd = this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE"); + } + cmd += " \""; + cmd += cmakeExecutable; + cmd += "\" -E tar cfz control.tar.gz ./control ./md5sums"; + const char* controlExtra = + this->GetOption("CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA"); if( controlExtra ) { std::vector<std::string> controlExtraList; |